Dev: survey active filter corrections

LimeSurvey · Sep 5, 2019 · 5755762 · 5755762
1 parent 95fefdb
commit 5755762
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/application/views/admin/super/sidemenu.php b/application/views/admin/super/sidemenu.php
@@ -75,4 +75,4 @@
     v-bind:style="{'min-height':'80vh','max-height': $store.state.inSurveyViewHeight, width : $store.getters.sideBarSize}"
     v-bind:data-collapsed="$store.state.isCollapsed">
     <sidebar />
-</div>
+</div>
diff --git a/assets/packages/adminsidepanel/build.min/js/adminsidepanel.js b/assets/packages/adminsidepanel/build.min/js/adminsidepanel.js
diff --git a/assets/packages/adminsidepanel/build/js/adminsidepanel.js b/assets/packages/adminsidepanel/build/js/adminsidepanel.js
diff --git a/assets/packages/adminsidepanel/src/components/subcomponents/_questionsgroups.vue b/assets/packages/adminsidepanel/src/components/subcomponents/_questionsgroups.vue
@@ -15,6 +15,7 @@ export default {
         };
     },
     computed: {
+        surveyIsActive() {return window.SideMenuData.isActive; },
         createQuestionGroupLink() { return window.SideMenuData.createQuestionGroupLink },
         createQuestionLink() { return window.SideMenuData.createQuestionLink },
         calculatedHeight() {
@@ -156,6 +157,7 @@ export default {
                 } 
                 
             } else {
+                if(window.SideMenuData.isActive) {return;}
                 this.addActive(questiongroupObject.gid);
                 if (this.draggedQuestion.gid !== questiongroupObject.gid) {
                     const removedFromInital = LS.ld.remove(
@@ -211,6 +213,7 @@ export default {
         },
         dragoverQuestion($event, questionObject, questionGroupObject) {
             if (this.questionDragging) {
+                if(this.questionDragging.gid !== questionObject.gid && window.SideMenuData.isActive) {return;}
                 let orderSwap = questionObject.question_order;
                 questionObject.question_order = this.draggedQuestion.question_order;
                 this.draggedQuestion.question_order = orderSwap;
@@ -265,7 +268,7 @@ export default {
                 >
                     <div class="col-12 ls-flex-row nowrap ls-space padding right-5 bottom-5">
                         <i 
-                            v-if="!$store.state.surveyActiveState"
+                            v-if="!surveyIsActive"
                             class="fa fa-bars bigIcons dragPointer" 
                             draggable="true"
                             @dragend="endDraggingGroup($event, questiongroup)"