diff --git a/.travis.yml b/.travis.yml index 00f1a969..440c98dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,12 +12,7 @@ addons: env: global: - - TRAVIS_NODE_VERSION="4" - - CORE_RELEASE=master - - ARTIFACTS_REGION=us-east-1 - - ARTIFACTS_BUCKET=silverstripe-travis-artifacts - - secure: "uql39x7U1QSn1PXeGCgkREOWt9avvedfNI/CF5ESeSnlpuLLKVmZcQ4V1kCO0/0K0WbBb9tMyC4we6KDccZFwhqPqmFD2q0m76CISz8eduEWoSU1HFfWzkGKfUbe1sVWZtr/zqLjrjrbXKxwnieK2HxXEw9nUmMLCUXvg9gShiQ=" - - secure: "0AL85od1+sMZ/cDyIcehVTGULy0n7IaYmVqJ2mDjbmcRkBx/LwTB9nWxcAgQmP0jt01N6Bjwy2vpBwmR0r0nOJYkUpHOv63F0qkhYVjjLRffwhw7nGbKW4HViTLfF0AfZaj3IErGsEWzpTbo0QOZvHI1OsWPTbQEIXyuZPV9nBk=" + - CORE_RELEASE=4 matrix: include: @@ -61,7 +56,7 @@ script: - "if [ \"$PHPUNIT_COVERAGE_TEST\" = \"1\" ]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi" after_failure: - - php ~/travis-support/travis_upload_artifacts.php --if-env BEHAT_TEST,ARTIFACTS_BUCKET,ARTIFACTS_KEY,ARTIFACTS_SECRET --target-path $TRAVIS_REPO_SLUG/$TRAVIS_BUILD_ID/$TRAVIS_JOB_ID --artifacts-base-url https://s3.amazonaws.com/$ARTIFACTS_BUCKET/ + - php ~/travis-support/travis_upload_artifacts.php --if-env BEHAT_TEST,ARTIFACTS_KEY --target-path $TRAVIS_REPO_SLUG/$TRAVIS_BUILD_ID/$TRAVIS_JOB_ID --artifacts-base-url https://s3.amazonaws.com/$ARTIFACTS_BUCKET/ branches: except: diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js index 0e08219a..90567e12 100644 --- a/client/dist/js/bundle.js +++ b/client/dist/js/bundle.js @@ -12,7 +12,7 @@ this.find("#Form_AddForm_ParentID_Holder .TreeDropdownField").bind("change",func },loadCachedChildren:function i(t){var e=this.getParentCache() return"undefined"!=typeof e[t]?e[t]:null},saveCachedChildren:function a(t,e){var n=this.getParentCache() -n[t]=e,this.setParentCache(n)},updateTypeList:function o(){var e=this.data("hints"),n=this.find("#Form_AddForm_ParentID_Holder .TreeDropdownField"),i=this.find("input[name=ParentModeField]:checked").val(),a=n.data("metadata"),o=a&&"child"===i?n.getValue()||this.getParentID():null,s=a?a.ClassName:null,r=s&&"child"===i?s:"Root",d="undefined"!=typeof e[r]?e[r]:null,l=this,c=d&&"undefined"!=typeof d.defaultChild?d.defaultChild:null,u=[] +n[t]=e,this.setParentCache(n)},updateTypeList:function o(){var e=this.data("hints"),n=this.find("#Form_AddForm_ParentID_Holder .TreeDropdownField"),i=this.find("input[name=ParentModeField]:checked").val(),a=n.data("metadata"),o=a&&"child"===i?n.getValue()||this.getParentID():null,s=a?a.ClassName:null,r=s&&"child"===i&&o?s:"Root",d="undefined"!=typeof e[r]?e[r]:null,l=this,c=d&&"undefined"!=typeof d.defaultChild?d.defaultChild:null,u=[] if(o){if(this.hasClass("loading"))return diff --git a/client/src/legacy/CMSMain.AddForm.js b/client/src/legacy/CMSMain.AddForm.js index da50040d..6f7c6466 100644 --- a/client/src/legacy/CMSMain.AddForm.js +++ b/client/src/legacy/CMSMain.AddForm.js @@ -54,7 +54,7 @@ $.entwine('ss', function($){ ? (parentTree.getValue() || this.getParentID()) : null, newClassName = metadata ? metadata.ClassName : null, - hintKey = (newClassName && parentMode === 'child') + hintKey = (newClassName && parentMode === 'child' && id) ? newClassName : 'Root', hint = (typeof hints[hintKey] !== 'undefined') ? hints[hintKey] : null, diff --git a/code/Controllers/CMSMain.php b/code/Controllers/CMSMain.php index fb764e01..dd8ef252 100644 --- a/code/Controllers/CMSMain.php +++ b/code/Controllers/CMSMain.php @@ -1435,10 +1435,14 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr $token->updateFieldSet($fields); $tokenField = $fields->first(); $tokenHtml = ($tokenField) ? $tokenField->FieldHolder() : ''; + $publishAllDescription = _t( + 'CMSMain.PUBALLFUN2', + 'Pressing this button will do the equivalent of going to every page and pressing "publish". ' + . 'It\'s intended to be used after there have been massive edits of the content, such as when ' + . 'the site was first built.' + ); $response .= '
' . _t('CMSMain.PUBALLFUN2', 'Pressing this button will do the equivalent of going to every page and pressing "publish". It\'s - intended to be used after there have been massive edits of the content, such as when the site was - first built.') . '
+' . $publishAllDescription . '