Fixed issue #7625: Cannot include response and invitation infomation …

…in confirmation message
LimeSurvey · Mar 1, 2013 · f3776d6 · f3776d6
1 parent 38cc39b
commit f3776d6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/application/controllers/admin/limereplacementfields.php b/application/controllers/admin/limereplacementfields.php
@@ -83,7 +83,7 @@ private function _getQuestionList($action, $gid, $qid, array $fieldmap, $questio
                 continue;
             }
 
-            if ($this->_shouldAddQuestion($action, $gid, $qid, $question, $previousQuestion)) {
+            if (is_null($qid) || $this->_shouldAddQuestion($action, $gid, $qid, $question, $previousQuestion)) {
                 $isPreviousPageQuestion = $this->_addQuestionToList($action, $gid, $question, $questionType, $surveyformat, $isPreviousPageQuestion, $questionList);
                 $previousQuestion = $question;
             }

diff --git a/application/helpers/admin/htmleditor_helper.php b/application/helpers/admin/htmleditor_helper.php
@@ -243,7 +243,7 @@ function getInlineEditor($fieldtype,$fieldname,$fieldtext, $surveyID=null,$gID=n
         ,LimeReplacementFieldsQID : \"".$qID."\"
         ,LimeReplacementFieldsType : \"".$fieldtype."\"
         ,LimeReplacementFieldsAction : \"".$action."\"
-        ,LimeReplacementFieldsPath : \"".Yii::app()->getController()->createUrl("admin/limereplacementfields/index/")."\"
+        ,LimeReplacementFieldsPath : \"".Yii::app()->getController()->createUrl("admin/limereplacementfields/sa/index/")."\"
         ,width:'660'
         ,language:'".sTranslateLangCode2CK(Yii::app()->session['adminlang'])."'
         ,smiley_path : \"".Yii::app()->getConfig('uploadurl')."/images/smiley/msn/\"\n"

diff --git a/application/views/admin/htmleditor/pop_editor_view.php b/application/views/admin/htmleditor/pop_editor_view.php
@@ -42,7 +42,7 @@ function closeme()
                         LimeReplacementFieldsType: "<?php echo $sFieldType; ?>",
                         LimeReplacementFieldsAction: "<?php echo $sAction; ?>",
                         smiley_path: "<?php echo Yii::app()->getConfig('rooturl') . '/upload/images/smiley/msn/'; ?>",
-                        LimeReplacementFieldsPath : "<?php echo Yii::app()->getConfig('rooturl') . '/index.php/admin/limereplacementfields/index'; ?>",
+                        LimeReplacementFieldsPath : "<?php echo Yii::app()->getConfig('rooturl') . '/index.php/admin/limereplacementfields/sa/index'; ?>",
                         language : "<?php echo $ckLanguage ?>"
                         <?php echo $htmlformatoption; ?> });
                 });

diff --git a/scripts/admin/limereplacementfields/dialogs/limereplacementfields.js b/scripts/admin/limereplacementfields/dialogs/limereplacementfields.js
@@ -13,7 +13,7 @@
 			title : lang.title,
 			minWidth : 300,
 			minHeight : 80,
-			height : 200,
+			height : 260,
 			resizable : CKEDITOR.DIALOG_RESIZE_NONE,
 			contents :
 			[