Fixed issue #14598: Bad order shown in List question (#1237)

Dev: question order get group_order Dev: add “Group / “ before Question order
LimeSurvey · May 2, 2019 · 3337b5a · 3337b5a
1 parent 48b1078
commit 3337b5a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/application/models/Question.php b/application/models/Question.php
@@ -980,8 +980,8 @@ public function search()
                 'desc'=>'t.qid desc',
             ),
             'question_order'=>array(
-                'asc'=>'t.question_order asc',
-                'desc'=>'t.question_order desc',
+                'asc'=>'groups.group_order asc, t.question_order asc',
+                'desc'=>'groups.group_order desc,t.question_order desc',
             ),
             'title'=>array(
                 'asc'=>'t.title asc',
@@ -1008,7 +1008,9 @@ public function search()
             ),
         );
 
-        $sort->defaultOrder = array('question_order' => CSort::SORT_ASC);
+        $sort->defaultOrder = array(
+            'question_order' => CSort::SORT_ASC,
+        );
 
         $criteria = new CDbCriteria;
         $criteria->with = array('groups');

diff --git a/application/views/admin/survey/Question/listquestions.php b/application/views/admin/survey/Question/listquestions.php
@@ -73,9 +73,9 @@
                                 'value'=>'$data->qid',
                             ),
                             array(
-                                'header' => gT('Question order'),
+                                'header' => gT("Group / Question order"),
                                 'name' => 'question_order',
-                                'value'=>'$data->question_order',
+                                'value'=>'$data->groups->group_order ." / ". $data->question_order',
                             ),
                             array(
                                 'header' => gT('Code'),
@@ -96,11 +96,13 @@
                                 'value'=>'$data->typedesc',
                                 'htmlOptions' => array('class' => 'col-md-1'),
                             ),
+
                             array(
                                 'header' => gT('Group'),
                                 'name' => 'group',
                                 'value'=>'$data->groups->group_name',
                             ),
+
                             array(
                                 'header' => gT('Mandatory'),
                                 'type' => 'raw',