Merge pull request osTicket#5204 from aydreeihn/issue/inline-field-in…

…tegrity Inline Edit Fields With Data Integrity
jezuk · Nov 25, 2019 · 7578d5c · 7578d5c
2 parents 933bb1f + 6015d04
commit 7578d5c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/include/class.forms.php b/include/class.forms.php
@@ -1332,7 +1332,6 @@ function getLocal($subtag, $default=false) {
     }
 
     function getEditForm($source=null) {
-
         $fields = array(
                 'field' => $this,
                 'comments' => new TextareaField(array(

diff --git a/include/staff/templates/dynamic-form.tmpl.php b/include/staff/templates/dynamic-form.tmpl.php
@@ -84,7 +84,7 @@
                     ?>" data-entry-id="<?php echo $field->getAnswer()->get('entry_id');
                     ?>"> <i class="icon-trash"></i> </a></div><?php
                 }
-                if ($a && !$a->getValue() && $field->isRequiredForClose()) {
+                if ($a && !$a->getValue() && $field->isRequiredForClose() && get_class($field) != 'BooleanField') {
     ?><i class="icon-warning-sign help-tip warning"
         data-title="<?php echo __('Required to close ticket'); ?>"
         data-content="<?php echo __('Data is required in this field in order to close the related ticket'); ?>"

diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
@@ -649,6 +649,13 @@ class="icon-building icon-fixed-width"></i> <?php
                     }
                     else
                       echo $v;
+
+                    $a = $field->getAnswer();
+                    $hint = ($field->isRequiredForClose() && $a && !$a->getValue() && get_class($field) != 'BooleanField') ?
+                        sprintf('<i class="icon-warning-sign help-tip warning field-label" data-title="%s" data-content="%s"
+                        /></i>', __('Required to close ticket'),
+                        __('Data is required in this field in order to close the related ticket')) : '';
+                    echo $hint;
                   ?>
               </a>
             <?php