Fixed issue #11906: Сan not see the quota name when you select an ans…

…wer for quota
LimeSurvey · Nov 16, 2016 · 06dd988 · 06dd988
1 parent 4a3ebd1
commit 06dd988
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/application/controllers/admin/quotas.php b/application/controllers/admin/quotas.php
@@ -441,8 +441,8 @@ function new_answer($iSurveyId, $sSubAction = 'new_answer')
         if (($sSubAction == "new_answer" || ($sSubAction == "new_answer_two" && !isset($_POST['quota_qid']))) && Permission::model()->hasSurveyPermission($iSurveyId, 'quotas', 'create'))
         {
             $result = Quota::model()->findAllByPk(Yii::app()->request->getPost('quota_id'));
-            foreach ($result as $aQuotaDetails)
-            {
+
+            foreach ($result as $aQuotaDetails){
                 $quota_name = $aQuotaDetails['name'];
             }
 
@@ -461,8 +461,11 @@ function new_answer($iSurveyId, $sSubAction = 'new_answer')
 
         if ($sSubAction == "new_answer_two" && isset($_POST['quota_qid']) && Permission::model()->hasSurveyPermission($iSurveyId, 'quotas', 'create'))
         {
-            $aResults = Quota::model()->findByPk(Yii::app()->request->getPost('quota_qid'));
-            $sQuotaName = $aResults['name'];
+            $result = Quota::model()->findAllByPk(Yii::app()->request->getPost('quota_id'));
+
+            foreach ($result as $aQuotaDetails){
+                $quota_name = $aQuotaDetails['name'];
+            }
 
             $aQuestionAnswers = self::getQuotaAnswers(Yii::app()->request->getPost('quota_qid'), $iSurveyId, Yii::app()->request->getPost('quota_id'));
             $x = 0;

diff --git a/application/views/admin/quotas/newanswertwo_view.php b/application/views/admin/quotas/newanswertwo_view.php
@@ -15,7 +15,7 @@
             <?php else:?>
                 <div class="jumbotron message-box">
                     <div class='row'>
-                        <h2><?php echo sprintf(gT("New answer for quota %s"), $quota_name);?></h2>
+                        <h2><?php echo sprintf(gT("New answer for quota '%s'"), $quota_name);?></h2>
                         <p class="lead"><?php eT("Select answer:");?></p>
                         <?php echo CHtml::form(array("admin/quotas/sa/insertquotaanswer/surveyid/{$iSurveyId}"), 'post', array('#'=>'quota_'.sanitize_int($_POST['quota_id']), 'class' => 'form-horizontal')); ?>
                             <div class='form-group'>