Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: adrexia/silverstripe-batch-actions-plus
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.0.4
Choose a base ref
...
head repository: adrexia/silverstripe-batch-actions-plus
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 5 commits
  • 3 files changed
  • 2 contributors

Commits on Jul 11, 2014

  1. Update composer.json

    mi3ll committed Jul 11, 2014
    Copy the full SHA
    52cea25 View commit details
  2. Made statics private (as required for SS 3.1)

    mi3ll committed Jul 11, 2014
    Copy the full SHA
    74855ab View commit details

Commits on Jul 12, 2014

  1. Merge pull request #5 from milkyway-multimedia/3.1-compatiblity

    3.1 compatiblity
    Naomi Guyer committed Jul 12, 2014
    Copy the full SHA
    6b6e666 View commit details

Commits on Sep 8, 2014

  1. Fix for get paramaters

    Support for get parameters appearing in the url (as id the case with translatable)
    Naomi Guyer committed Sep 8, 2014
    Copy the full SHA
    14ce023 View commit details

Commits on Sep 16, 2014

  1. BUG: Changes not visible when moving page

    It seems that the CMS reading mode for sitetree is set to Live, but showing draft. Not sure what is going on, but this fixes it.
    Naomi Guyer committed Sep 16, 2014
    Copy the full SHA
    64dd1f2 View commit details
Showing with 9 additions and 8 deletions.
  1. +5 −4 code/CMSBatchAction_MoveToController.php
  2. +2 −2 composer.json
  3. +2 −2 javascript/LeftAndMain.BatchActionsPlus.js
9 changes: 5 additions & 4 deletions code/CMSBatchAction_MoveToController.php
Original file line number Diff line number Diff line change
@@ -7,11 +7,11 @@
*/
class CMSBatchAction_MoveToController extends LeftAndMain {

static $url_segment = 'batchmoveto';
private static $url_segment = 'batchmoveto';

static $menu_title = 'Move to';
private static $menu_title = 'Move to';

static $required_permission_codes = false;
private static $required_permission_codes = false;

private static $allowed_actions = array (
'MovePagesForm',
@@ -41,7 +41,8 @@ public function index($request, $pageIDs = null) {
* @return Form $form
*/
public function MovePagesForm($pageIDs = null){

Versioned::reading_stage('Stage'); // Needs this for changes to effect draft tree

$action = FormAction::create('doMovePages', 'Move')
->setUseButtonTag('true')
->addExtraClass('ss-ui-button ss-ui-action-constructive batch-form-actions')
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
],
"require":
{
"silverstripe/framework": "~3.0",
"silverstripe/cms": "~3.0"
"silverstripe/framework": "~3.1",
"silverstripe/cms": "~3.1"
}
}
4 changes: 2 additions & 2 deletions javascript/LeftAndMain.BatchActionsPlus.js
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@
id = 'ss-ui-dialog-' + new Date().getTime(),
selectValue = $('#Form_BatchActionsForm_Action').val();

if(selectValue !== 'admin/pages/batchactions/moveto' || this.getProcessed() === true){
if(selectValue.indexOf('moveto') === -1 || this.getProcessed() === true){
this._super(e);
this.setProcessed(false); //reset
} else {
@@ -94,4 +94,4 @@
});
});

}(jQuery));
}(jQuery));