Fixed issue #8394: Selected graph type in statistics is not saved

LimeSurvey · Nov 22, 2013 · 5cb0e00 · 5cb0e00
1 parent 660897f
commit 5cb0e00
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/application/controllers/admin/statistics.php b/application/controllers/admin/statistics.php
@@ -525,7 +525,8 @@ function graph()
         $MyCache = new pCache($tempdir.'/');
 	    $aData['success'] = 1;
         $sStatisticsLanguage=sanitize_languagecode($_POST['sStatisticsLanguage']);
-        $oStatisticsLanguage = new Limesurvey_lang($sStatisticsLanguage);        
+        $oStatisticsLanguage = new Limesurvey_lang($sStatisticsLanguage);  
+
 	    if (isset($_POST['cmd']) && isset($_POST['id'])) {
 	        list($qsid, $qgid, $qqid) = explode("X", substr($_POST['id'], 0), 3);
             if(!is_numeric(substr($qsid,0,1))) {
@@ -547,15 +548,15 @@ function graph()
                             "width" => $aattr['location_mapwidth'],
                             "height" => $aattr['location_mapheight']
                         );
-	                    Question_attributes::model()->setAttribute($qqid, 'statistics_showmap', 1);
+	                    Question_attributes::model()->setQuestionAttribute($qqid, 'statistics_showmap', 1);
                     } else {
 	                    $aData['success'] = 0;
                     }
 	                break;
 	            case 'hidemap':
 	                if (isset($aattr['location_mapservice'])) {
                         $aData['success'] = 1;
-	                    Question_attributes::model()->setAttribute($qqid, 'statistics_showmap', 0);
+	                    Question_attributes::model()->setQuestionAttribute($qqid, 'statistics_showmap', 0);
                     } else {
 	                    $aData['success'] = 0;
                     }
@@ -571,23 +572,22 @@ function graph()
 	                }
 
                     $bChartType = $qtype != "M" && $qtype != "P" && $aattr["statistics_graphtype"] == "1";
-
                     $adata = Yii::app()->session['stats'][$_POST['id']];
 	                $aData['chartdata'] = createChart($qqid, $qsid, $bChartType, $adata['lbl'], $adata['gdata'], $adata['grawdata'], $MyCache, $oStatisticsLanguage, $qtype);
 
 
-                    Question_attributes::model()->setAttribute($qqid, 'statistics_showgraph', 1);
+                    Question_attributes::model()->setQuestionAttribute($qqid, 'statistics_showgraph', 1);
 	                break;
 	            case 'hidegraph':
-                    Question_attributes::model()->setAttribute($qqid, 'statistics_showgraph', 0);
+                    Question_attributes::model()->setQuestionAttribute($qqid, 'statistics_showgraph', 0);
 	                break;
 	            case 'showbar':
 	                if ($qtype == "M" || $qtype == "P") {
 	                    $aData['success'] = 0;
 	                    break;
 	                }
 
-                    Question_attributes::model()->setAttribute($qqid, 'statistics_graphtype', 0);
+                    Question_attributes::model()->setQuestionAttribute($qqid, 'statistics_graphtype', 0);
 
                     $adata = Yii::app()->session['stats'][$_POST['id']];
 	                $aData['chartdata'] =  createChart($qqid, $qsid, 0, $adata['lbl'], $adata['gdata'], $adata['grawdata'], $MyCache, $oStatisticsLanguage, $qtype);
@@ -600,7 +600,7 @@ function graph()
 	                    break;
 	                }
 
-                    Question_attributes::model()->setAttribute($qqid, 'statistics_graphtype', 1);
+                    Question_attributes::model()->setQuestionAttribute($qqid, 'statistics_graphtype', 1);
 
                     $adata = Yii::app()->session['stats'][$_POST['id']];
 	                $aData['chartdata'] =  createChart($qqid, $qsid, 1, $adata['lbl'], $adata['gdata'], $adata['grawdata'], $MyCache, $oStatisticsLanguage, $qtype);

diff --git a/application/models/Question_attributes.php b/application/models/Question_attributes.php
@@ -61,6 +61,19 @@ public function getQuestionAttributes($qid)
 			->query();
     }
 
+    public function setQuestionAttribute($iQuestionID,$sAttributeName, $sValue)
+    {
+        $oModel = new self;
+        $oModel->updateAll(array('value'=>$sValue),'attribute=:attributeName and qid=:questionID',array(':attributeName'=>$sAttributeName,':questionID'=>$iQuestionID));
+        return Yii::app()->db->createCommand()
+            ->select()
+            ->from($this->tableName())
+            ->where(array('and', 'qid=:qid'))->bindParam(":qid", $qid, PDO::PARAM_STR)
+            ->order('qaid asc')
+            ->query();
+    }
+
+
 	public static function insertRecords($data)
     {
         $attrib = new self;