Fix surveyaction::getSurveys_json

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@11837 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Jan 2, 2012 · fd64297 · fd64297
1 parent 3085497
commit fd64297
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/application/controllers/admin/surveyaction.php b/application/controllers/admin/surveyaction.php
@@ -715,7 +715,7 @@ public function getSurveys_json()
         //!!! Is this even possible to execute?
         if (empty(Yii::app()->session['USER_RIGHT_SUPERADMIN']))
             $surveys->permission(Yii::app()->user->getId());
-        $surveys = $surveys->findAll();
+        $surveys = $surveys->with('languagesettings', 'owner')->findAll();
 
         $aSurveyEntries->page = $page;
         $aSurveyEntries->records = count($surveys);
@@ -724,6 +724,8 @@ public function getSurveys_json()
         {
             $aSurveyEntry = array();
             $rows = $surveys[$j];
+            $rows = array_merge($rows->attributes, $rows->languagesettings->attributes, $rows->owner->attributes);
+
             // Set status
             if ($rows['active'] == "Y" && $rows['expires'] != '' && $rows['expires'] < date_shift(date("Y-m-d H:i:s"), "Y-m-d", Yii::app()->getConfig('timeadjust')))
             {
@@ -797,8 +799,8 @@ public function getSurveys_json()
             //Set Responses
             if ($rows['active'] == "Y")
             {
-                $partial = Survey_dynamics::model($rows['sid'])->countByAttributes(array('submitdate' => null));
-                $all = Survey_dynamics::model($rows['sid'])->count();
+                $partial = Survey_dynamic::model($rows['sid'])->countByAttributes(array('submitdate' => null));
+                $all = Survey_dynamic::model($rows['sid'])->count();
 
                 $aSurveyEntry[] = $all - $partial;
                 $aSurveyEntry[] = $partial;