Fixed : "Preview of question not working."

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_ci@10976 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Sep 12, 2011 · 14d3083 · 14d3083
1 parent b4a112c
commit 14d3083
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/application/core/Survey_Common_Controller.php b/application/core/Survey_Common_Controller.php
@@ -105,10 +105,13 @@ function _questionbar($surveyid,$gid,$qid,$action)
                     . "<img src='$imageurl/seperator.gif' alt=''  />\n"; */
 
                     //
+                    $this->load->helper('surveytranslator');
                     $tmp_survlangs = GetAdditionalLanguagesFromSurveyID($surveyid);
                     $baselang = GetBaseLanguageFromSurveyID($surveyid);
                     $tmp_survlangs[] = $baselang;
                     rsort($tmp_survlangs);
+                    $data['tmp_survlangs'] = $tmp_survlangs;
+                    //$data['surveyid'] = $surveyid;
 
                     // Test question Language Selection Popup
                     /**$surveysummary .="<div class=\"langpopup\" id=\"previewquestionpopup\">".$clang->gT("Please select a language:")."<ul>";
@@ -362,7 +365,7 @@ function _questionbar($surveyid,$gid,$qid,$action)
                 $questionsummary .= "</td></tr>";
             }
             $questionsummary .= "</table>"; */
-
+            
             $questionsummary .= $this->load->view("admin/survey/Question/questionbar_view",$data,true);
         }
         $finaldata['display'] = $questionsummary;
@@ -1093,6 +1096,7 @@ function _surveysummary($surveyid,$action=null)
         $data['showstyle'] = $showstyle;
         $data['aAdditionalLanguages'] = $aAdditionalLanguages;
 		$this->load->view("admin/survey/surveysummary",$data);
+
     }
 
 	/**

diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -3280,12 +3280,14 @@ function getQuestionAttributes($qid, $type='')
     }
     $setattributes=array();
     $qid=sanitize_int($qid);
-    $fields = array('attribute', 'value', 'language');
+    //$fields = array('attribute', 'value', 'language');
+    $fields = array('attribute', 'value');
     $condition = "qid = $qid";
     $CI->load->model('question_attributes_model');
     //$query = "SELECT attribute, value FROM ".db_table_name('question_attributes')." WHERE qid=$qid";
     $result = $CI->question_attributes_model->getSomeRecords($fields,$condition) or safe_die("Error finding question attributes");  //Checked)
     $setattributes=array();
+
     foreach ($result->result_array() as $row)
     {
         if (empty($row['language']))

diff --git a/application/views/admin/survey/Question/questionbar_view.php b/application/views/admin/survey/Question/questionbar_view.php
@@ -1,3 +1,11 @@
+<?php if (isset($tmp_survlangs)) { ?>
+    <div class="langpopup" id="previewquestionpopup"><?php echo $clang->gT("Please select a language:"); ?><ul>
+    <?php foreach ($tmp_survlangs as $tmp_lang) 
+    { ?>
+        <li><a target='_blank' onclick="$('#previewquestion').qtip('hide');" href='<?php echo site_url("admin/question/preview/".$surveyid."/".$qid."/".$tmp_lang); ?>' accesskey='d'><?php echo getLanguageNameFromCode($tmp_lang,false); ?></a></li>
+    <?php } ?>
+    </ul></div>
+<?php } ?> 
 <div class='menubar-title ui-widget-header'>
             <strong><?php echo $clang->gT("Question"); ?></strong> <span class='basic'><?php echo $qrrow['question']; ?> (<?php echo $clang->gT("ID").":".$qid; ?>)</span>
             </div>