From 46b17ffdb6223f1b4cf82dd0a291b1225dcad466 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Thu, 26 Feb 2015 17:18:30 -0600
Subject: [PATCH] forms: Add validator error to textbox widget for selection
field
Allow admins to offer a custom error message when using the text input for a
selection field.
Also, do not display this error message if the field was left blank.
---
include/class.dynamic_forms.php | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/include/class.dynamic_forms.php b/include/class.dynamic_forms.php
index 9e6142a51..457d9b626 100644
--- a/include/class.dynamic_forms.php
+++ b/include/class.dynamic_forms.php
@@ -1324,10 +1324,14 @@ class SelectionField extends FormField {
if (!$this->errors()) {
$config = $this->getConfiguration();
if ($config['widget'] == 'textbox') {
- if (!$entry
- || !($k=key($entry))
- || !($i=$this->getList()->getItem((int) $k)))
- $this->_errors[] = __('Unknown or invalid input');
+ if ($entry && (
+ !($k=key($entry))
+ || !($i=$this->getList()->getItem((int) $k))
+ )) {
+ $config = $this->getConfiguration();
+ $this->_errors[] = $this->getLocal('validator-error', $config['validator-error'])
+ ?: __('Unknown or invalid input');
+ }
} elseif ($config['typeahead']
&& ($entered = $this->getWidget()->getEnteredValue())
&& !in_array($entered, $entry))
@@ -1362,6 +1366,17 @@ class SelectionField extends FormField {
),
'hint'=>__('Typeahead will work better for large lists')
)),
+ 'validator-error' => new TextboxField(array(
+ 'id'=>5, 'label'=>__('Validation Error'), 'default'=>'',
+ 'configuration'=>array('size'=>40, 'length'=>80,
+ 'translatable'=>$this->getTranslateTag('validator-error')
+ ),
+ 'visibility' => new VisibilityConstraint(
+ new Q(array('widget__eq'=>'textbox')),
+ VisibilityConstraint::HIDDEN
+ ),
+ 'hint'=>__('Message shown to user if the item entered is not in the list')
+ )),
'prompt' => new TextboxField(array(
'id'=>3,
'label'=>__('Prompt'), 'required'=>false, 'default'=>'',
--
GitLab