diff --git a/application/controllers/admin/export.php b/application/controllers/admin/export.php index 2be26c9664b..e2f3dbe8284 100644 --- a/application/controllers/admin/export.php +++ b/application/controllers/admin/export.php @@ -199,7 +199,7 @@ public function exportresults() $aFieldsOptions[$sFieldName] = array('title'=>viewHelper::getFieldText($fieldinfo), 'data-fieldname'=>$fieldinfo['fieldname'], 'data-emcode'=>viewHelper::getFieldCode($fieldinfo, array('LEMcompat'=>true))); // No need to filter title : Yii do it (remove all tag) } - $data['SingleResponse'] = (int) returnGlobal('id'); + $data['SingleResponse'] = intval(App()->getRequest()->getParam('id')); $data['selecthide'] = $selecthide; $data['selectshow'] = $selectshow; $data['selectinc'] = $selectinc; diff --git a/application/controllers/admin/responses.php b/application/controllers/admin/responses.php index cad9ff1da8d..3cd806cebb6 100644 --- a/application/controllers/admin/responses.php +++ b/application/controllers/admin/responses.php @@ -1067,25 +1067,6 @@ private function _zipFiles($iSurveyID, $responseIds, $zipfilename) $this->getController()->redirect(array("admin/responses", "sa" => "browse", "surveyid" => $iSurveyID)); } - - - /** - * Responsible for setting the session variables for attribute map page redirect - * @todo Use user session? - * @todo Used? - */ - public function setSession($unset = false, $sid = null) - { - if (!$unset) { - unset(Yii::app()->session['responsesid']); - Yii::app()->session['responsesid'] = Yii::app()->request->getPost('itemsid'); - } else { - unset(Yii::app()->session['responsesid']); - $this->getController()->redirect(array("admin/export", "sa"=>"exportresults", "surveyid"=>$sid)); - } - - } - /** * Renders template(s) wrapped in header and footer * diff --git a/application/extensions/admin/grid/MassiveActionsWidget/README.md b/application/extensions/admin/grid/MassiveActionsWidget/README.md index 1049459f71b..10bc142c9d9 100644 --- a/application/extensions/admin/grid/MassiveActionsWidget/README.md +++ b/application/extensions/admin/grid/MassiveActionsWidget/README.md @@ -85,7 +85,10 @@ The link, to be defined, need: There is currently 3 action types (they are the result of the refactorisation of the old jQgrid massive actions) : -- **redirect** : when clicking on the action link, user will be redirected to the wanted url in a blank windows. The list of the checked items will be posted in a string separated by |. This is used only for tokens right now (send email...). +- **redirect** : when clicking on the action link, user will be redirected to the wanted url in a blank windows. The list of the checked items will be posted in a string separated by `|` (by default). This is used only for tokens right now (send email...), extra parameters in data of the link : + - `input-name` : name of the input created + - `input-separator` : separator used to separate checked item (defult to `|`) + - `target` : target set of the action : default `_blanck`, use `_self` to use current windows - **fill-session-and-redirect** : basically the same than redirect, but calling first an action on a controller to fill the session with the checked items before redirecting. This is used only for tokens "add participant to CPDB" for now. - **modal** : This is the most used case. It raises a modal to first confirm the action, then submit an ajax request to the defined url, and closes it OR shows an array of results. diff --git a/application/extensions/admin/grid/MassiveActionsWidget/assets/listActions.js b/application/extensions/admin/grid/MassiveActionsWidget/assets/listActions.js index 9d83436a802..0d4a66dda53 100644 --- a/application/extensions/admin/grid/MassiveActionsWidget/assets/listActions.js +++ b/application/extensions/admin/grid/MassiveActionsWidget/assets/listActions.js @@ -47,11 +47,11 @@ var onClickListAction = function () { $oCheckedItems = $gridid.yiiGridView('getChecked', $('.listActions').data('pk')); // So we can join var newForm = jQuery('