Fixed issue #10386: possible again to to edit text of answer option i…

…n active survey
LimeSurvey · Feb 11, 2016 · a242120 · a242120
1 parent 32ffbb4
commit a242120
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/application/controllers/survey/index.php b/application/controllers/survey/index.php
@@ -694,6 +694,9 @@ function _niceExit(&$redata, $iDebugLine, $sTemplateDir = null, $asMessage = arr
     {
         global $oTemplate;
 
+
+        $asMessage[]="<input type='hidden' class='hidemenubutton'/>";
+
         if(isset($redata['surveyid']) && $redata['surveyid'] && !isset($thisurvey))
         {
             $thissurvey=getSurveyInfo($redata['surveyid']);

diff --git a/application/helpers/SurveyRuntimeHelper.php b/application/helpers/SurveyRuntimeHelper.php
@@ -799,7 +799,7 @@ function run($surveyid,$args)
 
                     if (trim(str_replace(array('<p>','</p>'),'',$thissurvey['surveyls_endtext'])) == '')
                     {
-                        $completed = "<br /><span class='success'>" . gT("Thank you!") . "</span><br /><br />\n\n"
+                        $completed = "<br /><input type='hidden' class='hidemenubutton'/><span class='success'>" . gT("Thank you!") . "</span><br /><br />\n\n"
                         . gT("Your survey responses have been recorded.") . "<br /><br />\n";
                     }
                     else

diff --git a/application/models/Answer.php b/application/models/Answer.php
@@ -144,7 +144,7 @@ public function updateRecord($data, $condition=FALSE)
     }
 
     function insertRecords($data)
-    {
+    {    
         $oRecord = new self;
         foreach ($data as $k => $v)
             $oRecord->$k = $v;

diff --git a/application/views/admin/survey/Question/answerOptions_view.php b/application/views/admin/survey/Question/answerOptions_view.php
@@ -172,7 +172,8 @@
                                                 <td  style="vertical-align: middle;">
                                                     <input
                                                         type='hidden'
-                                                        name='code_<?php echo $row->qid; ?>_<?php echo $row->scale_id; ?>'
+
+                                                        name='code_<?php echo $position; ?>_<?php echo $scale_id; ?>'
                                                         value="<?php echo $title; ?>"
                                                         maxlength='20'
                                                         size='5'
@@ -319,7 +320,7 @@ class='answer form-control input-lg'
 
                                                 <?php echo  getEditor("editanswer","answer_".$row->language."_".$row->qid."_{$row->scale_id}", "[".gT("Subquestion:", "js")."](".$row->language.")",$surveyid,$gid,$qid,'editanswer'); ?>
 
-                                                <?php if ($activated != 'Y' && $first):?>
+                                                <?php if ($activated != 'Y' && $first ):?>
                                                     <?php
                                                         // TODO : remove this if statement, and merge the two td
                                                         // implies : define in controller titles

diff --git a/templates/default/scripts/template.js b/templates/default/scripts/template.js
@@ -197,7 +197,12 @@ $(document).ready(function(){
                 }
 
             });
-
         });
     }
+
+    // Hide the menu buttons at the end of the Survey
+    if($(".hidemenubutton").length>0)
+    {
+        $('.navbar-right').hide();
+    }
 });