Fixed issue #15786: No groupdata is shown for the selector in the ass…

…essments modal
LimeSurvey · Jan 28, 2020 · 54dbf7a · 54dbf7a
1 parent 2b9caea
commit 54dbf7a
Showing 1 changed file with 19 additions and 11 deletions.
diff --git a/application/controllers/admin/assessments.php b/application/controllers/admin/assessments.php
@@ -104,16 +104,15 @@ protected function _renderWrappedTemplate($sAction = 'assessments', $aViewUrls =
     private function prepareDataArray(&$aData, $collectEdit = false)
     {
         $iSurveyID = $aData['surveyid'];
+        $oSurvey = $aData['survey'];
 
         $aHeadings = array(gT("Scope"), gT("Question group"), gT("Minimum"), gT("Maximum"));
         $aData['headings'] = $aHeadings;
-        $oSurvey = Survey::model()->findByPk($iSurveyID);
         $oAssessments = Assessment::model();
         $oAssessments->sid = $iSurveyID;
-        $this->_collectGroupData($iSurveyID, $aData);
 
+        $aData['groups'] = $this->_collectGroupData($oSurvey, $aData);
         $this->setSearchParams($oAssessments);
-
         $aData['model'] = $oAssessments;
         $aData['pageSizeAsessements'] = Yii::app()->user->getState('pageSizeAsessements', Yii::app()->params['defaultPageSize']);
         $aData['actiontitle'] = gT("Add");
@@ -210,6 +209,7 @@ private function _showAssessments($iSurveyID, $action)
         $oSurvey = Survey::model()->findByPk($iSurveyID);
 
         $aData = [];
+        $aData['survey'] = $oSurvey;
         $aData['surveyid'] = $iSurveyID;
         $aData['action'] = $action;
 
@@ -246,20 +246,28 @@ private function _activateAsessement($iSurveyID)
     }
 
     /**
-     * @param int $iSurveyID
+     * return the groups of the current survey
+     * @param Survey $oSurvey
      * @param array $aData
-     * @return array
+     * @return array $aGroups groupnames in array
      */
-    private function _collectGroupData($iSurveyID, &$aData = array())
+    private function _collectGroupData($oSurvey, &$aData = array())
     {
-        $aData['groups'] = [];
-        $groups = QuestionGroup::model()->findAllByAttributes(array('sid' => $iSurveyID));
+        $aGroups = [];
+        $groups = QuestionGroup::model()->with(
+            [
+                'questionGroupL10ns' => [
+                    'condition' => 'questionGroupL10ns.language = :language',
+                    'params' => array(':language' => $oSurvey->language)
+                ]
+            ]
+        )->findAllByAttributes(array('sid' => $oSurvey->sid));
         foreach ($groups as $group) {
             $groupId = $group->attributes['gid'];
-            $groupName = $group->attributes['group_name'];
-            $aData['groups'][$groupId] = $groupName;
+            $groupName = $group->getGroupNameI10N($oSurvey->language);
+            $aGroups[$groupId] = $groupName;
         }
-        return $aData;
+        return $aGroups;
     }
 
     /**