Fixed issue #17500: When mass-deleting, list survey names and ids to …

…be deleted (#2100) * Fixed issue #17500: When mass-deleting, list survey names and ids to be deleted * Fixed issue #17500: When mass-deleting, list survey names and ids to be deleted - Removed hungarian notation - Make sure the input is an array * Fixed issue #17500: When mass-deleting, list survey names and ids to be deleted - Fix renderItemsSelected() Co-authored-by: encuestabizdevgit <devgit@encuesta.biz>
LimeSurvey · Nov 10, 2021 · ada1d9c · ada1d9c
1 parent f40c560
commit ada1d9c
Show file tree

Hide file tree

Showing 5 changed files with 120 additions and 1 deletion.
diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
@@ -78,6 +78,37 @@ public function deleteMultiple()
         );
     }
 
+    /**
+     * Render selected items for massive action
+     * @return void
+     */
+    public function renderItemsSelected()
+    {
+        $surveyIds = json_decode(Yii::app()->request->getPost('$oCheckedItems'), true);
+        if(!is_array($surveyIds)) {
+            throw new CHttpException(400, gT('Invalid list of checked items'));
+        }
+        $results = [];
+
+        $tableLabels = [gT('Survey ID'), gT('Survey Title'), gT('Status')];
+        foreach ($surveyIds as $surveyId) {
+            if (Permission::model()->hasSurveyPermission($surveyId, 'survey', 'delete')) {
+                $survey                        = Survey::model()->findByPk($surveyId);
+                $results[$surveyId]['title']  = $survey->correct_relation_defaultlanguage->surveyls_title;
+                $results[$surveyId]['result'] = 'selected';
+            }
+        }
+
+        Yii::app()->getController()->renderPartial(
+            'ext.admin.survey.ListSurveysWidget.views.massive_actions._selected_survey',
+            [
+                'aResults'     => $results,
+                'successLabel' => gT('Seleted'),
+                'tableLabels'  => $tableLabels
+            ]
+        );
+    }
+
     /**
      * @todo
      */

diff --git a/application/extensions/admin/grid/MassiveActionsWidget/assets/listActions.js b/application/extensions/admin/grid/MassiveActionsWidget/assets/listActions.js
@@ -23,9 +23,11 @@ var onClickListAction =  function () {
     var $actionUrl     = $that.data('url');                                                   // The url of the Survey Controller action to call
     var onSuccess      = $that.data('on-success');
     var $gridid        = $('#'+$(this).closest('div.listActions').data('grid-id'));
+    var grididvalue    = $gridid.attr('id');
     var $oCheckedItems = $gridid.yiiGridView('getChecked', $(this).closest('div.listActions').data('pk')); // List of the clicked checkbox
     var $oCheckedItems = JSON.stringify($oCheckedItems);
     var actionType = $that.data('actionType');
+    var selectedList   = $(".selected-items-list");
 
     if( $oCheckedItems == '[]' ) {
         //If no item selected, the error modal "please select first an item" is shown
@@ -106,6 +108,31 @@ var onClickListAction =  function () {
     var $oldModalTitle     = $modalTitle.text();
     var $oldModalBody      = $modalBody.html();
     var $oldModalButtons   = $modal.find('.modal-footer-buttons');     // Modal footer with yes/no buttons
+    var modalShowSelected = $modal.data('show-selected');
+    var modalSelectedUrl = $modal.data('selected-url');
+
+    //Display selected data in modals after clicked on action
+    if (modalShowSelected == 'yes' && modalSelectedUrl) {  
+
+        //set csrfToken for ajaxpost
+        var csrfToken = $('meta[name="csrf-token"]').attr("content");
+
+        //clear selected list view 
+        selectedList.empty();
+
+        //ajaxpost to set data in the selected items div 
+        $.ajax({
+            url :modalSelectedUrl,
+            type : 'POST',
+            data : {grididvalue, $oCheckedItems, csrfToken},
+            success: function(html, status) {
+                selectedList.html(html);
+            },
+            error: function(requestObject, error, errorThrown) {
+                console.log(error);
+            }
+        });
+    }
 
     // When user close the modal, we put it back to its original state
     $modal.on('hidden.bs.modal', function (e) {
@@ -152,6 +179,7 @@ var onClickListAction =  function () {
         $oldModalButtons.hide();                                    // Hide the 'Yes/No' buttons
         $modalClose.show();                                         // Show the 'close' button
         $ajaxLoader.show();                                         // Show the ajax loader
+        selectedList.empty();                                       //clear selected Item list
 
         // Ajax request
         $.ajax({

diff --git a/application/extensions/admin/grid/MassiveActionsWidget/views/modals/yes-no.php b/application/extensions/admin/grid/MassiveActionsWidget/views/modals/yes-no.php
@@ -1,5 +1,11 @@
 <!-- Modal confirmation for <?php echo $aAction['action'];?> -->
-<div id="massive-actions-modal-<?php echo $aAction['action'];?>-<?php echo $key; ?>" class="modal fade" role="dialog" data-keepopen="<?php echo $aAction['keepopen'];?>">
+<div id="massive-actions-modal-<?php echo $aAction['action'];?>-<?php echo $key; ?>"
+     class="modal fade"
+     role="dialog"
+     data-keepopen="<?php echo $aAction['keepopen'];?>"
+     data-show-selected="<?php if(isset($aAction['showSelected'])){ echo $aAction['showSelected']; }?>"
+     data-selected-url="<?php if(isset($aAction['selectedUrl'])){ echo $aAction['selectedUrl']; }?>"
+>
     <div class="modal-dialog">
         <!-- Modal content-->
         <div class="modal-content">
@@ -10,6 +16,9 @@
             <div class="modal-body">
                 <div class='modal-body-text'><?php echo $aAction['htmlModalBody']; ?></div>
 
+                <!-- shows list of selected items in the modal-->
+                <div class="selected-items-list"></div>
+
                 <?php if (isset($aAction['aCustomDatas'])):?>
                     <!--
                         Custom datas needed for action defined directly in the widget call.

diff --git a/...tion/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_selected_survey.php b/...tion/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_selected_survey.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * This view display the result of selected surveys. It's rendered via ajax for the confirmation modal in survey list
+ *
+ * @var $aResults   The array containing the result of each survey selection
+ */
+?>
+<hr>
+<table class="table table-striped">
+    <thead>
+        <th><?php eT('Survey ID');?></th>
+        <th><?php eT('Title');?></th>
+        <th><?php eT('Status');?></th>
+    </thead>
+
+    <tbody>
+        <?php foreach($aResults as $iSid => $result):?>
+            <tr>
+                <td>
+                    <?php echo $iSid;?>
+                </td>
+                <td>
+                    <?php echo $result['title'];?>
+                </td>
+                <?php if ($result['result']):?>
+                    <td class="text-success">
+                        <?php eT('Selected'); ?>
+                    </td>
+                <?php else: ?>
+                    <td class="text-warning">
+                        <?php echo $result['error'] ; ?>
+                    </td>
+                <?php endif;?>
+            </tr>
+        <?php endforeach;?>
+    </tbody>
+</table>
diff --git a/application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_selector.php b/application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_selector.php
@@ -29,6 +29,8 @@
                     'actionType'    => 'modal',
                     'modalType'     => 'yes-no',
                     'keepopen'      => 'yes',
+                    'showSelected'  => 'yes',
+                    'selectedUrl'   => App()->createUrl('/admin/survey/sa/renderItemsSelected/'),
                     'sModalTitle'   => gT('Delete surveys'),
                     'htmlModalBody' => gT('Are you sure you want to delete all those surveys?'),
                 ),
@@ -53,6 +55,8 @@
                     'actionType'  => 'modal',
                     'modalType'   => 'yes-no',
                     'keepopen'    => 'yes',
+                    'showSelected'  => 'yes',
+                    'selectedUrl'   => App()->createUrl('/admin/survey/sa/renderItemsSelected/'),
                     'sModalTitle'   => gT('Set survey theme'),
                     'htmlModalBody' => $this->controller->renderFile(__DIR__.'/_select_survey_theme.php',array(),true),
                 ),
@@ -70,6 +74,8 @@
                     'actionType'  => 'modal',
                     'modalType'   => 'yes-no',
                     'keepopen'    => 'yes',
+                    'showSelected'  => 'yes',
+                    'selectedUrl'   => App()->createUrl('/admin/survey/sa/renderItemsSelected/'),
                     'sModalTitle'   => gT('Change survey group'),
                     'htmlModalBody' => $this->controller->renderFile(__DIR__.'/_change_survey_group.php',array(),true),
                 ),
@@ -102,6 +108,8 @@
                     'actionType'  => 'modal',
                     'modalType'   => 'yes-no',
                     'keepopen'    => 'yes',
+                    'showSelected'  => 'yes',
+                    'selectedUrl'   => App()->createUrl('/admin/survey/sa/renderItemsSelected/'),
                     'sModalTitle'   => gT('Export survey archive'),
                     'htmlModalBody' => gT('This will export the survey archive (.lsa) for all selected active surveys. They will be provided in a single ZIP archive.').' '.gT('Continue?'),
                 ),
@@ -120,6 +128,8 @@
                     'actionType'  => 'modal',
                     'modalType'   => 'yes-no',
                     'keepopen'    => 'yes',
+                    'showSelected'  => 'yes',
+                    'selectedUrl'   => App()->createUrl('/admin/survey/sa/renderItemsSelected/'),
                     'sModalTitle'   => gT('Export survey structure'),
                     'htmlModalBody' => gT('This will export the survey structure (.lss) for all selected active surveys. They will be provided in a single ZIP archive.').' '.gT('Continue?'),
 
@@ -136,6 +146,8 @@
                     'actionType'  => 'modal',
                     'modalType'   => 'yes-no',
                     'keepopen'    => 'yes',
+                    'showSelected'  => 'yes',
+                    'selectedUrl'   => App()->createUrl('/admin/survey/sa/renderItemsSelected/'),
                     'sModalTitle'   => gT('Export printable survey'),
                     'htmlModalBody' => gT('This will export a printable version of your survey.').' '.gT('Continue?'),
                 ),
@@ -152,6 +164,8 @@
                     'actionType'  => 'modal',
                     'modalType'   => 'yes-no',
                     'keepopen'    => 'yes',
+                    'showSelected'  => 'yes',
+                    'selectedUrl'   => App()->createUrl('/admin/survey/sa/renderItemsSelected/'),
                     'sModalTitle'   => gT('Set expiry date'),
                     'htmlModalBody' => $this->controller->renderFile(__DIR__.'/_expiry_dialog.php',array(),true),
                 ),