Dev: Filter assessments by language to not show duplicates

LimeSurvey · Mar 5, 2018 · 303bc60 · 303bc60
1 parent ebcd93c
commit 303bc60
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/application/models/Assessment.php b/application/models/Assessment.php
@@ -123,9 +123,9 @@ public function getColumns()
             ),
             array(
                 'name' => 'scope',
-                'value' => '$data->scope == "G" ? eT("Global") : eT("Total")',
+                'value' => '$data->scope == "G" ? eT("Group") : eT("Total")',
                 'htmlOptions' => ['class' => 'col-sm-1'],
-                'filter' => TbHtml::dropDownList('assessment["scope"]', 'scope', ['' => gT('All'), 'T' => gT('Total'), 'G' => gT("Global")])
+                'filter' => TbHtml::dropDownList('assessment["scope"]', 'scope', ['' => gT('All'), 'T' => gT('Total'), 'G' => gT("Group")])
             ),
             array(
                 'name' => 'name',
@@ -149,7 +149,7 @@ public function getColumns()
 
     public function search()
     {
-// @todo Please modify the following code to remove attributes that should not be searched.
+        // @todo Please modify the following code to remove attributes that should not be searched.
 
         $criteria = new CDbCriteria;
 
@@ -161,6 +161,7 @@ public function search()
         $criteria->compare('minimum', $this->minimum);
         $criteria->compare('maximum', $this->maximum);
         $criteria->compare('message', $this->message, true);
+        $criteria->compare('language', App()->language);
 
         // TODO: Does not work with Postgres.
         //$criteria->group = 'id';