New feature: Question List, user can search over qid, code, question …

…and question type Fixed issue #10803: Can't search by question id in question list
LimeSurvey · May 25, 2016 · 2e98220 · 2e98220
1 parent fcb5b87
commit 2e98220
Showing 1 changed file with 9 additions and 13 deletions.
diff --git a/application/models/Question.php b/application/models/Question.php
@@ -893,31 +893,27 @@ public function search()
         );
 
         $criteria = new CDbCriteria;
+        $criteria->together = true;
+        $criteria->with=array('groups');
         $criteria->condition="t.sid=:surveyid AND t.language=:language AND parent_qid=0";
         $criteria->params=(array(':surveyid'=>$this->sid,':language'=>$this->language));
-        $criteria->join='LEFT JOIN {{groups}} AS groups ON ( groups.gid = t.gid AND t.language = groups.language AND groups.sid = t.sid)';
-
-
-        $criteria->compare('title', $this->title, true, 'AND');
 
         $criteria2 = new CDbCriteria;
-        $criteria2->condition="t.sid=:surveyid AND t.language=:language AND parent_qid=0";
-        $criteria2->params=(array(':surveyid'=>$this->sid,':language'=>$this->language));
-        $criteria2->join='LEFT JOIN {{groups}} AS groups ON ( groups.gid = t.gid AND t.language = groups.language AND groups.sid = t.sid)';
+        $criteria2->compare('title', $this->title, true, 'OR');
+        $criteria2->compare('question', $this->title, true, 'OR');
+        $criteria2->compare('type', $this->title, true, 'OR');
 
+        $qid_reference = (Yii::app()->db->getDriverName() == 'pgsql' ?' t.qid::varchar' : 't.qid');
+        $criteria2->compare($qid_reference, $this->title, true, 'OR');
 
+        $criteria->mergeWith($criteria2, 'AND');
+        $criteria->order = 'group_order ASC,question_order ASC';
 
         if($this->group_name != '')
         {
             $criteria->addCondition("groups.group_name = '$this->group_name'");
-            $criteria2->addCondition("groups.group_name = '$this->group_name'");
         }
 
-        $criteria2->compare('question', $this->title, true, 'AND');
-        $criteria->mergeWith($criteria2, 'OR');
-
-        $criteria->order = 'group_order ASC,question_order ASC';
-
         $dataProvider=new CActiveDataProvider('Question', array(
             'criteria'=>$criteria,
             'sort'=>$sort,