dev: topbarbutton reset for surveymenu and surveymenuentry

LimeSurvey · Aug 13, 2021 · aa120c8 · aa120c8
1 parent 0292bd2
commit aa120c8
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 8 deletions.
diff --git a/application/views/admin/super/fullpagebar_view.php b/application/views/admin/super/fullpagebar_view.php
@@ -92,8 +92,9 @@ class='btn btn-default'
             <!-- Reset -->
             <?php if (isset($fullpagebar['menus']['buttons']['reset']) && $fullpagebar['menus']['buttons']['reset']) :?>
                 <a class="btn btn-warning"
-                   href="#restoremodal"
-                   data-toggle="modal">
+                   id="restoreBtn"
+                   href="#"
+                >
                     <i class="fa fa-refresh"></i>&nbsp;
                     <?php eT('Reset') ?>
                 </a>

diff --git a/application/views/admin/surveymenu/index.php b/application/views/admin/surveymenu/index.php
@@ -100,7 +100,7 @@
     </div>
 </div>
 
-<div class="modal fade" id="restoremodal" tabindex="-1" role="dialog" data-keyboard="false" data-backdrop="static">
+<div class="modal fade" id="restoremodalsurveymenu" tabindex="-1" role="dialog" data-keyboard="false" data-backdrop="static">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">

diff --git a/application/views/admin/surveymenu_entries/index.php b/application/views/admin/surveymenu_entries/index.php
@@ -78,7 +78,7 @@
     </div>
   </div>
 
-  <div class="modal fade" id="restoremodal" tabindex="-1" role="dialog" data-keyboard="false" data-backdrop="static">
+  <div class="modal fade" id="restoreModalSurveyMenuEntry" tabindex="-1" role="dialog" data-keyboard="false" data-backdrop="static">
     <div class="modal-dialog" role="document">
       <div class="modal-content">
           <?php

diff --git a/assets/packages/surveymenufunctions/surveymenufunctionswrapper.js b/assets/packages/surveymenufunctions/surveymenufunctionswrapper.js
@@ -74,21 +74,45 @@ var SurveyMenuFunctionsWrapper = function (targetCreateModal, targetGrid, urls)
             success: function (result) {
                 $.fn.yiiGridView.update(targetGrid);
             },
-            error: function(error){
+            error: function (error) {
                 console.log(error);
             }
         });
     },
+        /**
+         * Returns the correct modal for restoring data
+         *  (surveymenu or surveymenuentry
+         * @returns {*}
+         */
+        getModal = function () {
+            let active_tab = $("ul.tabs li a.active").attr('href');
+            let restoreModal = '';
+            switch (active_tab) {
+                case '#surveymenues':
+                    restoreModal = $('#restoremodalsurveymenu');
+                    break;
+                case '#surveymenuentries':
+                default:
+                    restoreModal = $('#restoreModalSurveyMenuEntry');
+            }
+            return restoreModal;
+        },
+        openRestoreModal = function () {
+            let restoreModal = getModal();
+            restoreModal.modal('show');
+        },
     runRestoreModal =  function () {
-        $('#restoremodal').find('.modal-content').html('<div class="ls-flex align-items-center align-content-center" style="height:200px"><i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i></div>')
+        //depending on which tab is active, the correct modal must be taken
+        // restoremodalsurveymenu and restoremodal
+        let restoreModal = getModal();
+        restoreModal.find('.modal-content').html('<div ' + 'class="ls-flex align-items-center align-content-center" style="height:200px"><i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i></div>')
         $.ajax({
             url: urls.restoreEntriesUrl,
             data: {},
             method: 'POST',
             dataType: 'json',
             success: function (result) {
-                console.log(result);
-                $('#restoremodal').find('.modal-content').html('<div class="ls-flex align-items-center align-content-center" style="height:200px">' + result.message + '</div>');
+                restoreModal.find('.modal-content').html('<div class="ls-flex align-items-center align-content-center" style="height:200px">' + result.message + '</div>');
 
                 if (result.success)
                     setTimeout(function () {
@@ -105,6 +129,10 @@ var SurveyMenuFunctionsWrapper = function (targetCreateModal, targetGrid, urls)
                     e.preventDefault();
                     runRestoreModal();
                 });
+
+                $('#restoreBtn').on('click', function (e) {
+                    openRestoreModal();
+                });
 
                 $('#createnewmenuentry').on('click', function (e) {
                     e.stopPropagation();
@@ -161,6 +189,10 @@ var SurveyMenuFunctionsWrapper = function (targetCreateModal, targetGrid, urls)
                     e.preventDefault();
                     runRestoreModal();
                 });
+
+                $('#restoreBtn').on('click', function (e) {
+                    openRestoreModal();
+                });
 
                 $('#createnewmenu').on('click', function (e) {
                     e.stopPropagation();