Fixed issue #15227: Unable to Delete Questions

LimeSurvey · Sep 5, 2019 · e749edd · olleharstedt · Sep 16, 2019 · e749edd
1 parent 3f839ff
commit e749edd
Show file tree

Hide file tree

Showing 8 changed files with 134 additions and 10,496 deletions.
diff --git a/assets/packages/adminbasics/build/adminbasics.debug.js b/assets/packages/adminbasics/build/adminbasics.debug.js
diff --git a/assets/packages/adminbasics/build/adminbasics.js b/assets/packages/adminbasics/build/adminbasics.js
@@ -27456,114 +27456,6 @@
 	  });
 	};
 
-	/**
-	 * Neccessary methods for the confirmation modal
-	 */
-
-	var ConfirmationModal = function ConfirmationModal(e) {
-	  //////PREGENERATED VARIABLES
-	  //Define the scope
-	  var _this = this; //Set everything to null on default
-
-
-	  var optionsDefault = {
-	    onclick: null,
-	    href: null,
-	    message: null,
-	    keepopen: null,
-	    postDatas: null,
-	    gridid: null,
-	    "ajax-url": null
-	  }; //////METHODS
-	  //Parse available options from specific item.data settings, if not available load relatedTarget settings
-
-	  var _parseOptions = function _parseOptions(e) {
-	    return lodash.each(optionsDefault, function (value, key) {
-	      optionsDefault[key] = $(_this).data(key) || $(e.relatedTarget).data(key) || optionsDefault[key];
-	    });
-	  },
-	      //Generate a simple link on the ok button
-	  _basicLink = function _basicLink() {
-	    $(_this).find('.btn-ok').attr('href', options.href);
-	  },
-	      //Evaluate a function on ok button click
-	  _onClickFunction = function _onClickFunction() {
-	    var onclick_fn = new Function(options.onclick);
-
-	    if (typeof onclick_fn == 'function') {
-	      $(_this).find('.btn-ok').off('click');
-	      $(_this).find('.btn-ok').on('click', function (ev) {
-	        if (!options.keepopen) {
-	          $('#confirmation-modal').modal('hide');
-	        }
-
-	        onclick_fn();
-	      });
-	      return;
-	    }
-
-	    console.error("Confirmation modal: onclick is not a function. Wrap data-onclick content in (function() { ... }).");
-	    return;
-	  },
-	      //Set up an ajax call and regenerate a gridView on ok button click
-	  _ajaxHandler = function _ajaxHandler() {
-	    $(_this).find('.btn-ok').on('click', function (ev) {
-	      $.ajax({
-	        type: "POST",
-	        url: options['ajax-url'],
-	        data: options.postDatas,
-	        success: function success(html, statut) {
-	          $.fn.yiiGridView.update(options.gridid); // Update the surveys list
-
-	          $('#confirmation-modal').modal('hide');
-	        },
-	        error: function error(html, statut) {
-	          $('#confirmation-modal .modal-body-text').append(html.responseText);
-	        }
-	      });
-	    });
-	  },
-	      _setTarget = function _setTarget() {
-	    //Set up normal href
-	    if (!!options.href) {
-	      _basicLink();
-
-	      return;
-	    } //Set up a complete function
-
-
-	    if (!!options.onclick) {
-	      _onClickFunction();
-
-	      return;
-	    } //Set up an ajax post
-
-
-	    if (!!options['ajax-url']) {
-	      _ajaxHandler();
-
-	      return;
-	    }
-
-	    console.error("Confirmation modal: Found neither data-href or data-onclick, nor ajax data.");
-	  }; //////RUN BINDINGS
-	  //Current options object
-
-
-	  var options = _parseOptions(e); //Set the message if available
-
-
-	  $(this).find('.modal-body-text').html(options.message); //Run setTarget to determine loading target
-
-	  _setTarget();
-	};
-
-	var loadMethods = function loadMethods() {
-	  $('#confirmation-modal').on('show.bs.modal', function (e) {
-	    ConfirmationModal.call(this, e);
-	  });
-	};
-
 	/**
 	 * Check the browsers console capabilities and bundle them into general functions
 	 * If the build environment was "production" only put out error messages.
@@ -27797,7 +27689,119 @@
 	  return ConsoleShim;
 	}();
 
-	var adminCoreLSConsole = new ConsoleShim('AdminCore', !window.debugState.backend);
+	var adminCoreLSConsole = new ConsoleShim('AdminCore', window.debugState ? window.debugState.backend : false); //!window.debugState.backend);
+
+	/**
+	 * Neccessary methods for the confirmation modal
+	 */
+
+	var ConfirmationModal = function ConfirmationModal(e) {
+	  //////PREGENERATED VARIABLES
+	  //Define the scope
+	  var _this = this; //Set everything to null on default
+
+
+	  var optionsDefault = {
+	    onclick: null,
+	    href: null,
+	    message: null,
+	    keepopen: null,
+	    postDatas: null,
+	    gridid: null,
+	    "ajax-url": null
+	  }; //////METHODS
+	  //Parse available options from specific item.data settings, if not available load relatedTarget settings
+
+	  var _parseOptions = function _parseOptions(e) {
+	    return lodash.each(optionsDefault, function (value, key) {
+	      optionsDefault[key] = $(_this).data(key) || $(e.relatedTarget).data(key) || optionsDefault[key];
+	    });
+	  },
+	      //Generate a simple link on the ok button
+	  _basicLink = function _basicLink() {
+	    adminCoreLSConsole.log('Binding basicLink in notification panel');
+	    $(_this).find('.btn-ok').attr('href', options.href);
+	  },
+	      //Evaluate a function on ok button click
+	  _onClickFunction = function _onClickFunction() {
+	    adminCoreLSConsole.log('Binding onClick-functions in notification panel');
+	    var onclick_fn = eval(options.onclick);
+
+	    if (typeof onclick_fn == 'function') {
+	      $(_this).find('.btn-ok').off('click');
+	      $(_this).find('.btn-ok').on('click', function (ev) {
+	        if (!options.keepopen) {
+	          $('#confirmation-modal').modal('hide');
+	        }
+
+	        onclick_fn();
+	      });
+	      return;
+	    }
+
+	    adminCoreLSConsole.error("Confirmation modal: onclick is not a function. Wrap data-onclick content in (function() { ... }).");
+	    return;
+	  },
+	      //Set up an ajax call and regenerate a gridView on ok button click
+	  _ajaxHandler = function _ajaxHandler() {
+	    adminCoreLSConsole.log('Binding ajax handler in notification panel');
+	    $(_this).find('.btn-ok').on('click', function (ev) {
+	      $.ajax({
+	        type: "POST",
+	        url: options['ajax-url'],
+	        data: options.postDatas,
+	        success: function success(html, statut) {
+	          $.fn.yiiGridView.update(options.gridid); // Update the surveys list
+
+	          $('#confirmation-modal').modal('hide');
+	        },
+	        error: function error(html, statut) {
+	          $('#confirmation-modal .modal-body-text').append(html.responseText);
+	        }
+	      });
+	    });
+	  },
+	      _setTarget = function _setTarget() {
+	    //Set up normal href
+	    if (!!options.href) {
+	      _basicLink();
+
+	      return;
+	    } //Set up a complete function
+
+
+	    if (!!options.onclick) {
+	      _onClickFunction();
+
+	      return;
+	    } //Set up an ajax post
+
+
+	    if (!!options['ajax-url']) {
+	      _ajaxHandler();
+
+	      return;
+	    }
+
+	    adminCoreLSConsole.error("Confirmation modal: Found neither data-href or data-onclick, nor ajax data.");
+	  }; //////RUN BINDINGS
+	  //Current options object
+
+
+	  var options = _parseOptions(e); //Set the message if available
+
+
+	  $(this).find('.modal-body-text').html(options.message); //Run setTarget to determine loading target
+
+	  _setTarget();
+	};
+
+	var loadMethods = function loadMethods() {
+	  adminCoreLSConsole.log('ConfirmationModal calling');
+	  $('#confirmation-modal').on('show.bs.modal', function (e) {
+	    ConfirmationModal.call(this, e);
+	  });
+	};
 
 	/**
 	 * Define global setters for LimeSurvey
@@ -29110,11 +29114,11 @@
 	    if (form.length < 1) throw "No form Found this can't be!";
 	    return form;
 	  },
-	      // displayLoadingState = (el) => {
-	  //     const loadingSpinner = '<i class="fa fa-cog fa-spin lsLoadingStateIndicator"></i>';
-	  //     $(el).prop('disabled', true).append(loadingSpinner);
-	  // },
-	  stopDisplayLoadingState = function stopDisplayLoadingState() {
+	      displayLoadingState = function displayLoadingState(el) {
+	    var loadingSpinner = '<i class="fa fa-cog fa-spin lsLoadingStateIndicator"></i>';
+	    $(el).prop('disabled', true).append(loadingSpinner);
+	  },
+	      stopDisplayLoadingState = function stopDisplayLoadingState() {
 	    adminCoreLSConsole.log('StopLoadingIconAnimation');
 	    LS.EventBus.$emit('loadingFinished'); // $('.lsLoadingStateIndicator').each((i,item) => {$(item).remove();});
 	  },

diff --git a/assets/packages/adminbasics/build/adminbasics.min.css b/assets/packages/adminbasics/build/adminbasics.min.css
diff --git a/assets/packages/adminbasics/build/adminbasics.min.js b/assets/packages/adminbasics/build/adminbasics.min.js
diff --git a/assets/packages/adminbasics/build/adminbasics.rtl.min.css b/assets/packages/adminbasics/build/adminbasics.rtl.min.css
diff --git a/assets/packages/adminbasics/src/components/lslog.js b/assets/packages/adminbasics/src/components/lslog.js
@@ -154,6 +154,6 @@ class ConsoleShim {
     }
 }
 
-const adminCoreLSConsole = new ConsoleShim('AdminCore', !window.debugState.backend);
+const adminCoreLSConsole = new ConsoleShim('AdminCore', (window.debugState ? window.debugState.backend : false)); //!window.debugState.backend);
 
 export default adminCoreLSConsole;
diff --git a/assets/packages/adminbasics/src/parts/confirmationModal.js b/assets/packages/adminbasics/src/parts/confirmationModal.js
@@ -2,6 +2,7 @@
  * Neccessary methods for the confirmation modal
  */
 import _ from 'lodash';
+import LOG from "../components/lslog";
 
 const ConfirmationModal = function(e){
     //////PREGENERATED VARIABLES
@@ -27,11 +28,13 @@ const ConfirmationModal = function(e){
     },
     //Generate a simple link on the ok button
     _basicLink = () => {
+        LOG.log('Binding basicLink in notification panel');
         $(_this).find('.btn-ok').attr('href', options.href);
     },
     //Evaluate a function on ok button click
     _onClickFunction = () => {
-        const onclick_fn = new Function(options.onclick);
+        LOG.log('Binding onClick-functions in notification panel');
+        const onclick_fn = eval(options.onclick);
         if (typeof onclick_fn == 'function') {
             $(_this).find('.btn-ok').off('click');
 
@@ -41,11 +44,12 @@ const ConfirmationModal = function(e){
             });
             return
         }
-        console.error("Confirmation modal: onclick is not a function. Wrap data-onclick content in (function() { ... }).");
+        LOG.error("Confirmation modal: onclick is not a function. Wrap data-onclick content in (function() { ... }).");
         return;
     },
     //Set up an ajax call and regenerate a gridView on ok button click
     _ajaxHandler = () => {
+        LOG.log('Binding ajax handler in notification panel');
         $(_this).find('.btn-ok').on('click', function(ev) {
             $.ajax({
                 type: "POST",
@@ -80,7 +84,7 @@ const ConfirmationModal = function(e){
             _ajaxHandler();
             return;
         }
-        console.error("Confirmation modal: Found neither data-href or data-onclick, nor ajax data.");
+        LOG.error("Confirmation modal: Found neither data-href or data-onclick, nor ajax data.");
     };
 
     //////RUN BINDINGS
@@ -93,6 +97,7 @@ const ConfirmationModal = function(e){
 };
 
 const loadMethods = ()=>{
+    LOG.log('ConfirmationModal calling');
     $('#confirmation-modal').on('show.bs.modal', function(e) {
         ConfirmationModal.call(this,e);
     });

diff --git a/assets/packages/adminbasics/src/parts/save.js b/assets/packages/adminbasics/src/parts/save.js
@@ -33,10 +33,10 @@ const SaveController = () => {
 
         return form;
     },
-    // displayLoadingState = (el) => {
-    //     const loadingSpinner = '<i class="fa fa-cog fa-spin lsLoadingStateIndicator"></i>';
-    //     $(el).prop('disabled', true).append(loadingSpinner);
-    // },
+    displayLoadingState = (el) => {
+        const loadingSpinner = '<i class="fa fa-cog fa-spin lsLoadingStateIndicator"></i>';
+        $(el).prop('disabled', true).append(loadingSpinner);
+    },
     stopDisplayLoadingState = () => {
         LOG.log('StopLoadingIconAnimation');
         LS.EventBus.$emit('loadingFinished');