Fixed issue 8137: Relevance equation cannot be edited for unknown rea…

…sons
LimeSurvey · Sep 18, 2013 · d8e5532 · d8e5532 · Shnoulle · Sep 18, 2013
1 parent 5146094
commit d8e5532
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/application/controllers/admin/question.php b/application/controllers/admin/question.php
@@ -787,6 +787,8 @@ public function index($sa, $surveyid, $gid, $qid=null)
                 $criteria->addCondition('language != :lang');
                 $aqresult = Questions::model()->findAll($criteria);
                 $aData['aqresult'] = $aqresult;
+
+                $aData['bRelevanceReadOnly']= Questions::model()->hasConditions($aData['qid'])>0;
             }
 
             $aData['clang'] = $clang;
@@ -810,11 +812,6 @@ public function index($sa, $surveyid, $gid, $qid=null)
                 $aData['selectormodeclass'] = $selectormodeclass;
             }
 
-            if (!$adding)
-                $qattributes = questionAttributes();
-            else
-                $qattributes = array();
-
             if ($adding)
             {
                 // Get the questions for this group

diff --git a/application/models/Questions.php b/application/models/Questions.php
@@ -331,6 +331,11 @@ public function getQuestionList($surveyid, $language)
                                                         ->bindParam(":language2", $language, PDO::PARAM_STR)
                                                         ->bindParam(":sid", $surveyid, PDO::PARAM_INT)->queryAll();
         }
+
+        public function hasConditions($iQuestionID)
+        {
+            return self::model()->count('qid = '.$iQuestionID);  
+        }
 
     }
 

diff --git a/application/views/admin/survey/Question/editQuestion_view.php b/application/views/admin/survey/Question/editQuestion_view.php
@@ -191,7 +191,10 @@
                 </li>
                 <li>
                     <label for='relevance'><?php $clang->eT("Relevance equation:"); ?></label>
-                    <textarea cols='50' rows='1' id='relevance' name='relevance'><?php echo $eqrow['relevance']; ?></textarea>
+                    <textarea cols='50' rows='1' id='relevance' name='relevance' <?php if (isset($bRelevanceReadOnly) && $bRelevanceReadOnly) {?> readonly='readonly'<?php } ?>><?php echo $eqrow['relevance']; ?></textarea>
+                     <?php if (isset($bRelevanceReadOnly) && $bRelevanceReadOnly) {?>
+                        <span class='annotation'> <?php $clang->eT("Note: You can't edit the relevance equation because there are currently conditions set for this question."); ?></span>
+                     <?php } ?>
                 </li>
 
                 <li id='Validation'>

diff --git a/styles/blobblueish/adminstyle.css b/styles/blobblueish/adminstyle.css
@@ -391,6 +391,7 @@ textarea {
 .annotation {
     font-size: 10px;
     color: #E00;
+    vertical-align: top;
 }
 
 .errortitle {

diff --git a/styles/gringegreen/adminstyle.css b/styles/gringegreen/adminstyle.css
@@ -394,6 +394,7 @@ textarea {
 .annotation {
     font-size: 10px;
     color: #FF9D00;
+    vertical-align: top;    
 }
 
 .errortitle {