Dev: Tooltip and another error message (Condition Designer)

LimeSurvey · Oct 20, 2016 · 22e92bd · 22e92bd
1 parent 00462d1
commit 22e92bd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/application/controllers/admin/conditionsaction.php b/application/controllers/admin/conditionsaction.php
@@ -833,6 +833,9 @@ protected function insertConditionAjax($args)
         elseif(isset($csrctoken) && $csrctoken != '') {
             $conditionCfieldname = $csrctoken;
         }
+        else {
+            return array(gT("Your condition could not be added! It did not include the question and/or answer upon which the condition was based. Please ensure you have selected a question and an answer."), 'error');
+        }
 
         $condition_data = array(
             'qid'        => $qid,

diff --git a/application/views/admin/conditions/conditionshead_view.php b/application/views/admin/conditions/conditionshead_view.php
@@ -40,6 +40,8 @@ class="btn btn-default pull-right condition-header-button"
             class='btn btn-default pull-right condition-header-button'
             data-toggle='modal'
             data-target='#quick-add-condition-modal'
+            data-tooltip='true'
+            data-title='<?php eT('Add multiple conditions without a page reload'); ?>'
         >
             <span class="fa fa-plus-circle"></span>
             &nbsp;
@@ -63,6 +65,7 @@ class='btn btn-default pull-right condition-header-button'
                 <h4 class="modal-title"><?php eT('Quick-add conditions'); ?></h4>
             </div>
             <div class="modal-body">
+                <!-- Condition form is in file quickAddConditionForm.php -->
                 <?php echo $quickAddConditionForm; ?>
             </div>
             <div class="modal-footer">