Fixed issue #13598: Missing filter when selecting parent survey group

LimeSurvey · May 25, 2018 · fa23659 · fa23659
1 parent 0abd142
commit fa23659
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/application/models/SurveysGroups.php b/application/models/SurveysGroups.php
@@ -254,9 +254,13 @@ public function getNextOrderPosition()
         return count($oSurveysGroups) + 1;
     }
 
-    public function getParentGroupOptions()
+    public function getParentGroupOptions($gsid = null)
     {
-        $oSurveysGroups = SurveysGroups::model()->findAll();
+        if (!empty($gsid)){
+            $oSurveysGroups = SurveysGroups::model()->findAll('gsid != :gsid', array(':gsid' => $gsid));
+        } else {
+            $oSurveysGroups = SurveysGroups::model()->findAll();
+        }
         $options = [
             '' => gT('No parent menu')
         ];

diff --git a/application/views/admin/surveysgroups/_form.php b/application/views/admin/surveysgroups/_form.php
@@ -54,7 +54,7 @@
     <!-- should be a selector based on group name -->
     <div class="row">
         <?php echo $form->labelEx($model,'parent_id'); ?>
-        <?php echo $form->dropDownList($model,'parent_id',$model->getParentGroupOptions()); ?>
+        <?php echo $form->dropDownList($model,'parent_id',$model->getParentGroupOptions($model->gsid)); ?>
         <?php echo $form->error($model,'parent_id'); ?>
     </div>