Dev: small optical amendments and a database fix

LimeSurvey · Jul 25, 2017 · 4ae84d4 · 4ae84d4
1 parent d75c38a
commit 4ae84d4
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 25 deletions.
diff --git a/application/helpers/update/updatedb_helper.php b/application/helpers/update/updatedb_helper.php
@@ -305,8 +305,6 @@ function db_upgrade_all($iOldDBVersion, $bSilent=false) {
          */
         if ($iOldDBVersion < 306) {
             $oTransaction = $oDB->beginTransaction();
-            $oDB->createCommand()->renameColumn('{{surveymenu_entries}}','order','ordering');
-            $oDB->createCommand()->renameColumn('{{surveymenu}}','order','ordering');
             createSurveyGroupTables306($oDB);
             $oTransaction->commit();
             $oDB->createCommand()->update('{{settings_global}}',array('stg_value'=>306),"stg_name='DBVersion'");

diff --git a/assets/packages/adminpanel/build/lsadminpanel.js b/assets/packages/adminpanel/build/lsadminpanel.js
@@ -28947,22 +28947,27 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
     methods: {
         controlActiveLink() {
             let currentUrl = window.location.href;
-            let lastMenuItemObject = __WEBPACK_IMPORTED_MODULE_1_lodash___default.a.find(this.$store.state.sidemenus, (itm, i) => {
-                return __WEBPACK_IMPORTED_MODULE_1_lodash___default.a.find(itm.entries, (itmm, j) => {
-                    console.log('sidemenus?', itmm.id == this.$store.state.lastMenuItemOpen);
-                    return itmm.id == this.$store.lastMenuItemOpen;
+            let lastMenuItemObject = false;
+            __WEBPACK_IMPORTED_MODULE_1_lodash___default.a.each(this.$store.state.sidemenus, (itm, i) => {
+                let activeObject = false;
+                __WEBPACK_IMPORTED_MODULE_1_lodash___default.a.each(itm.entries, (itmm, j) => {
+                    activeObject = itmm.id == this.$store.lastMenuItemOpen ? itmm : false;
                 });
+                lastMenuItemObject = activeObject || false;
             });
-            let lastQuestionObject = __WEBPACK_IMPORTED_MODULE_1_lodash___default.a.find(this.$store.state.questiongroups, (itm, i) => {
-                return itm.gid == this.$store.state.lastQuestionOpen;
+            let lastQuestionGroupObject = false;
+            __WEBPACK_IMPORTED_MODULE_1_lodash___default.a.find(this.$store.state.questiongroups, (itm, i) => {
+                lastQuestionGroupObject = itm.gid == this.$store.state.lastQuestionOpen ? itm : false;
             });
-            let lastQuestionGroupObject = __WEBPACK_IMPORTED_MODULE_1_lodash___default.a.find(this.$store.state.questiongroups, (itm, i) => {
-                return __WEBPACK_IMPORTED_MODULE_1_lodash___default.a.find(itm.questions, (itmm, j) => {
-                    return itmm.qid == this.$store.state.lastQuestionGroupOpen;
+            let lastQuestionObject = false;
+            __WEBPACK_IMPORTED_MODULE_1_lodash___default.a.each(this.$store.state.questiongroups, (itm, i) => {
+                let activeObject = false;
+                __WEBPACK_IMPORTED_MODULE_1_lodash___default.a.each(itm.questions, (itmm, j) => {
+                    activeObject = itmm.qid == this.$store.state.lastQuestionGroupOpen ? itmm : false;
                 });
+                lastQuestionObject = activeObject || false;
             });
-            console.log('rendersidemenusLinkCorrector', [lastMenuItemObject, lastQuestionObject, lastQuestionGroupObject]);
-            return;
+
             if (RegExp(lastMenuItemObject.link).test(currentUrl)) this.$store.commit('lastMenuItemOpen', lastMenuItemObject);
             if (RegExp(lastQuestionObject.link).test(currentUrl)) this.$store.commit('lastQuestionOpen', lastQuestionObject);
             if (RegExp(lastQuestionGroupObject.link).test(currentUrl)) this.$store.commit('lastQuestionGroupOpen', lastQuestionGroupObject);
@@ -30656,6 +30661,12 @@ const getAppState = function(userid){
         changeCurrentUser(state, newUser){
           state.currentUser = newUser;
         },
+        closeAllMenus(state){
+            state.lastMenuOpen = null;
+            state.lastMenuItemOpen = null;
+            state.lastQuestionGroupOpen = null;
+            state.lastQuestionOpen = null;
+        },
         lastMenuItemOpen(state, menuItem){
             state.lastMenuOpen = menuItem.menu_id;
             state.lastMenuItemOpen = menuItem.id;

diff --git a/assets/packages/adminpanel/build/lsadminpanel.js.map b/assets/packages/adminpanel/build/lsadminpanel.js.map
diff --git a/assets/packages/adminpanel/src/components/sidebar.vue b/assets/packages/adminpanel/src/components/sidebar.vue
@@ -61,22 +61,28 @@ export default {
     methods: {
         controlActiveLink(){
             let currentUrl = window.location.href;
-            let lastMenuItemObject = _.find(this.$store.state.sidemenus, (itm,i)=>{
-                return _.find(itm.entries, (itmm,j)=>{
-                    console.log('sidemenus?',(itmm.id == this.$store.state.lastMenuItemOpen));
-                    return itmm.id == this.$store.lastMenuItemOpen;
+            let lastMenuItemObject = false;
+            _.each(this.$store.state.sidemenus, (itm,i)=>{
+                let activeObject = false;
+                _.each(itm.entries, (itmm,j)=>{
+                    activeObject =  itmm.id == this.$store.lastMenuItemOpen ? itmm : false;
                 });
+                lastMenuItemObject = activeObject || false;
             });
-            let lastQuestionObject = _.find(this.$store.state.questiongroups, (itm,i)=>{
-                    return itm.gid == this.$store.state.lastQuestionOpen;
+            let lastQuestionGroupObject = false;
+            _.find(this.$store.state.questiongroups, (itm,i)=>{
+                    lastQuestionGroupObject =  itm.gid == this.$store.state.lastQuestionOpen ? itm : false;
             });
-            let lastQuestionGroupObject = _.find(this.$store.state.questiongroups, (itm,i)=>{
-                return _.find(itm.questions, (itmm,j)=>{
-                    return itmm.qid == this.$store.state.lastQuestionGroupOpen;
+            let lastQuestionObject = false;
+             _.each(this.$store.state.questiongroups, (itm,i)=>{
+                let activeObject = false;
+                _.each(itm.questions, (itmm,j)=>{
+                    activeObject =  itmm.qid == this.$store.state.lastQuestionGroupOpen ? itmm : false;
                 });
+                lastQuestionObject = activeObject  || false;
             });
-            console.log('rendersidemenusLinkCorrector',[lastMenuItemObject,lastQuestionObject,lastQuestionGroupObject]);
-            return;
+                       
+
             if(RegExp(lastMenuItemObject.link).test(currentUrl))
                 this.$store.commit('lastMenuItemOpen',lastMenuItemObject);
             if(RegExp(lastQuestionObject.link).test(currentUrl))