Fixed issue #13153: Confirm Popup stays active after deleting a singl…

…e token and clicking "yes"
LimeSurvey · Jan 16, 2018 · 1422d25 · 1422d25
1 parent 74ae353
commit 1422d25
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/application/extensions/admin/grid/MassiveActionsWidget/assets/listActions.js b/application/extensions/admin/grid/MassiveActionsWidget/assets/listActions.js
@@ -20,7 +20,7 @@ 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 $oCheckedItems = $.fn.yiiGridView.getChecked($gridid, $(this).closest('div.listActions').data('pk')); // List of the clicked checkbox
+    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');
 
@@ -39,7 +39,7 @@ var onClickListAction =  function () {
     // TODO : Switch case "redirection (with 2 type; post or fill session)"
     if(actionType == "redirect")
     {
-        $oCheckedItems = $.fn.yiiGridView.getChecked($gridid, $('.listActions').data('pk')); // So we can join
+        $oCheckedItems = $gridid.yiiGridView('getChecked', $('.listActions').data('pk')); // So we can join
         var newForm = jQuery('<form>', {
             'action': $actionUrl,
             'target': '_blank',
@@ -71,7 +71,7 @@ var onClickListAction =  function () {
 
     // Set window location href. Used by download files in responses list view.
     if (actionType == 'window-location-href') {
-        var $oCheckedItems = $.fn.yiiGridView.getChecked($gridid, $('.listActions').data('pk')); // So we can join
+        var $oCheckedItems = $gridid.yiiGridView('getChecked', $('.listActions').data('pk')); // So we can join
         window.location.href = $actionUrl + $oCheckedItems.join(',');
         return;
     }
@@ -83,7 +83,7 @@ var onClickListAction =  function () {
     if (actionType == 'custom') {
         var js = $that.data('custom-js');
         var func = eval(js);
-        var itemIds = $.fn.yiiGridView.getChecked($gridid, $('.listActions').data('pk'));
+        var itemIds = $gridid.yiiGridView('getChecked', $('.listActions').data('pk'));
         func(itemIds);
         return;
     }
@@ -113,7 +113,7 @@ var onClickListAction =  function () {
 
         if ($that.data('grid-reload') == "yes")
         {
-            $.fn.yiiGridView.update($gridid);                         // Update the surveys list
+            $gridid.yiiGridView('update');                         // Update the surveys list
             setTimeout(function(){
                 $(document).trigger("actions-updated");}, 500);    // Raise an event if some widgets inside the modals need some refresh (eg: position widget in question list)
         }

diff --git a/application/extensions/admin/survey/ListSurveysWidget/assets/reload.js b/application/extensions/admin/survey/ListSurveysWidget/assets/reload.js
@@ -9,7 +9,7 @@ $(document).on('ready  pjax:scriptcomplete', function() {
     {
         jQuery(document).on("change", '#pageSize', function()
         {
-            $.fn.yiiGridView.update('survey-grid',{ data:{ pageSize: $(this).val() }});
+            $('#survey-grid').yiiGridView('update',{ data:{ pageSize: $(this).val() }});
         });
     });
 });
diff --git a/assets/scripts/admin/tokens.js b/assets/scripts/admin/tokens.js
@@ -227,15 +227,12 @@ $(document).on('ready  pjax:scriptcomplete', function(){
                 url: actionUrl,
                 method: "GET",
                 success: function(data){
-                    try{
-                        $.fn.yiiGridView.update('token-grid', {
-                            complete: function(s){
-                                $modal.modal('hide');
-                            } // Update the surveys list
-                        });
-                    } catch(e){
-                        if(e){console.ls.error(e); $modal.modal('hide');}
-                    }
+
+                    $('#token-grid').yiiGridView('update',{
+                        complete: function(s){
+                            $modal.modal('hide');
+                        } // Update the surveys list
+                    });
                 }
             });
         })