Dev: 4ded98e child

Dev: just quick fix for error message in database controllers Dev: Using $model->getErrors() return the error set in rules
LimeSurvey · Nov 29, 2013 · 49ac245 · 49ac245
1 parent 7399fc5
commit 49ac245
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/application/controllers/admin/database.php b/application/controllers/admin/database.php
@@ -799,7 +799,18 @@ function index($sa = null)
                             $uqresult = $question->save();//($uqquery); // or safeDie ("Error Update Question: ".$uqquery."<br />");  // Checked)
                             if (!$uqresult)
                             {
-                                Yii::app()->setFlashMessage($clang->gT("Question could not be updated."),'error');
+                                $bOnError=true;
+                                $aErrorMessage=$question->getErrors();
+                                if(isset($aErrorMessage['title']) && count($aErrorMessage['title']))
+                                {
+                                    foreach($aErrorMessage['title'] as $sTitleError){
+                                        Yii::app()->setFlashMessage($sTitleError,'error');
+                                    }
+                                }
+                                else
+                                {
+                                    Yii::app()->setFlashMessage($clang->gT("Question could not be updated."),'error');
+                                }
                             }
                         }
                     }
@@ -825,8 +836,8 @@ function index($sa = null)
 
                     // Remove old subquestion scales
                     Question::model()->deleteAllByAttributes(array('parent_qid' => $qid), 'scale_id >= :scale_id', array(':scale_id' => $iSubquestionScales));
-
-                    Yii::app()->session['flashmessage'] = $clang->gT("Question was successfully saved.");
+                    if(!isset($bOnError) || !$bOnError)// This really a quick hack and need a better system
+                        Yii::app()->setFlashMessage($clang->gT("Question was successfully saved."));
                     //                    }
                     //                    else
                     //                    {