From a6a6592db0fc88cf783f465ecdef0bc831b284fb Mon Sep 17 00:00:00 2001 From: Paolo Date: Fri, 28 Apr 2017 17:17:31 +0200 Subject: [PATCH] 4th release --- application/libraries/WidgetLib.php | 4 ++-- application/views/system/testudf.php | 6 +----- application/views/widgets/dropdown.php | 4 ++-- application/widgets/UDFWidget.php | 30 +++++++++++++++++++++++--- 4 files changed, 32 insertions(+), 12 deletions(-) diff --git a/application/libraries/WidgetLib.php b/application/libraries/WidgetLib.php index f751fcb7d..3cca45d72 100644 --- a/application/libraries/WidgetLib.php +++ b/application/libraries/WidgetLib.php @@ -799,7 +799,7 @@ class DropdownWidget extends WidgetTpl $this->setElementsArray( success($tmpElements), true, - 'Select a value...', + $this->_args[Widget::HTML_ARG_NAME][UDFWidgetTpl::PLACEHOLDER], 'No data found for this UDF' ); @@ -932,7 +932,7 @@ abstract class UDFWidgetTpl extends Widget const FIELD_ARG_NAME = 'field'; const TITLE = 'title'; - const DESCRIPTION = 'description'; + const LABEL = 'description'; const PLACEHOLDER = 'placeholder'; const DEFAULT_VALUE = 'defaultValue'; const REGEX = 'regex'; diff --git a/application/views/system/testudf.php b/application/views/system/testudf.php index 7c00bfe84..d8f3439d4 100644 --- a/application/views/system/testudf.php +++ b/application/views/system/testudf.php @@ -1,10 +1,6 @@ load->view("templates/header", array("title" => "UDF")); ?> - -
- UDFWidget: -
- + load->view("templates/footer"); ?> \ No newline at end of file diff --git a/application/views/widgets/dropdown.php b/application/views/widgets/dropdown.php index 6efba3c95..c5b83603f 100644 --- a/application/views/widgets/dropdown.php +++ b/application/views/widgets/dropdown.php @@ -1,9 +1,9 @@ title)) { - $this->_args[Widget::HTML_ARG_NAME][UDFWidgetTpl::TITLE] = $this->_ci->phraseslib->getPhrases('core', 'German', $jsonSchema->title); + $tmpResult = $this->_ci->phraseslib->getPhrases('core', 'German', $jsonSchema->title, null, null, 'no'); + if (hasData($tmpResult)) + { + $this->_args[Widget::HTML_ARG_NAME][UDFWidgetTpl::LABEL] = $tmpResult->retval[0]->text; + } + else + { + $this->_args[Widget::HTML_ARG_NAME][UDFWidgetTpl::LABEL] = null; + } } if (isset($jsonSchema->description)) { - $this->_args[Widget::HTML_ARG_NAME][UDFWidgetTpl::DESCRIPTION] = $this->_ci->phraseslib->getPhrases('core', 'German', $jsonSchema->description); + $tmpResult = $this->_ci->phraseslib->getPhrases('core', 'German', $jsonSchema->description, null, null, 'no'); + if (hasData($tmpResult)) + { + $this->_args[Widget::HTML_ARG_NAME][UDFWidgetTpl::TITLE] = $tmpResult->retval[0]->text; + } + else + { + $this->_args[Widget::HTML_ARG_NAME][UDFWidgetTpl::TITLE] = null; + } } if (isset($jsonSchema->placeholder)) { - $this->_args[Widget::HTML_ARG_NAME][UDFWidgetTpl::PLACEHOLDER] = $this->_ci->phraseslib->getPhrases('core', 'German', $jsonSchema->placeholder); + $tmpResult = $this->_ci->phraseslib->getPhrases('core', 'German', $jsonSchema->placeholder, null, null, 'no'); + if (hasData($tmpResult)) + { + $this->_args[Widget::HTML_ARG_NAME][UDFWidgetTpl::PLACEHOLDER] = $tmpResult->retval[0]->text; + } + else + { + $this->_args[Widget::HTML_ARG_NAME][UDFWidgetTpl::PLACEHOLDER] = null; + } } }