blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-20 00:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Bugfix UDF dropdown, wrong check for selected value

Browse Source 
- UDF checkbox now is only one value, no multiple checkbox anymore
- Added method saveUDFs to model UDF_model
- Added new constants to resolve json schema parameters
This commit is contained in:
Paolo
2017-07-06 11:07:43 +02:00
parent 3abfcbc429
commit a530cd22b4
6 changed files with 209 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/WidgetLib.php
+55 -55
View File
@@ -1066,9 +1066,6 @@ class TextfieldWidgetUDF extends TextfieldWidget
*/
class CheckboxWidget extends Widget
{
// The name of the element of the data array given to the view
// this element is an array of elements to be place inside the dropdown
const WIDGET_DATA_ELEMENTS_ARRAY_NAME = 'ELEMENTS_ARRAY';
// Name of the property that will be used to store the value attribute of the option tag
const VALUE_FIELD = 'value';
// Name of the property that will be used to store the value between the option tags
@@ -1090,31 +1087,19 @@ class CheckboxWidget extends Widget
$this->_args[CheckboxWidget::CHECKED_ELEMENT] = Widget::HTML_DEFAULT_VALUE;
}
}
/**
*
*/
protected function setValuesArray($values)
protected function setValue($value)
{
if (isError($values))
$tmpValue = $value;
if (is_array($value) && count($value) > 0)
{
if (is_object($values) && isset($values->retval))
{
show_error($values->retval);
}
else if (is_string($values))
{
show_error($values);
}
else
{
show_error('Generic error occurred');
}
}
else
{
$this->_args[CheckboxWidget::WIDGET_DATA_ELEMENTS_ARRAY_NAME] = $values->retval;
$tmpValue = array_values($value)[0];
}
$this->_args[CheckboxWidget::VALUE_FIELD] = $tmpValue;
}
/**
@@ -1136,45 +1121,60 @@ class CheckboxWidgetUDF extends CheckboxWidget
*/
public function render($parameters)
{
$tmpElements = array();
//
foreach($parameters as $parameter)
if ($parameters != null)
{
//
if ((is_array($parameter) && count($parameter) == 2)
|| (is_string($parameter) || is_numeric($parameter))
|| (is_object($parameter) && isset($parameter->{PARENT::VALUE_FIELD}) && isset($parameter->{PARENT::DESCRIPTION_FIELD})))
{
$element = new stdClass(); //
//
if (is_array($parameter) && count($parameter) == 2)
{
$element->{PARENT::VALUE_FIELD} = $parameter[0]; //
$element->{PARENT::DESCRIPTION_FIELD} = $parameter[1]; //
}
//
else if (is_string($parameter) || is_numeric($parameter))
{
$element->{PARENT::VALUE_FIELD} = $parameter; //
$element->{PARENT::DESCRIPTION_FIELD} = $parameter; //
}
//
else if (is_object($parameter) && isset($parameter->{PARENT::VALUE_FIELD}) && isset($parameter->{PARENT::DESCRIPTION_FIELD}))
{
$element->{PARENT::VALUE_FIELD} = $parameter->{PARENT::VALUE_FIELD}; //
$element->{PARENT::DESCRIPTION_FIELD} = $parameter->{PARENT::DESCRIPTION_FIELD}; //
}
array_push($tmpElements, $element); //
}
$this->setValue($parameters);
}
else
{
$this->setValue('');
}
$this->setValuesArray(success($tmpElements));
$this->loadCheckboxView();
echo $this->content();
// $tmpElements = array();
//
// foreach($parameters as $parameter)
// {
// //
// if ((is_array($parameter) && count($parameter) == 2)
// || (is_string($parameter) || is_numeric($parameter))
// || (is_object($parameter) && isset($parameter->{PARENT::VALUE_FIELD})
// && isset($parameter->{PARENT::DESCRIPTION_FIELD})))
// {
// $element = new stdClass(); //
// //
// if (is_array($parameter) && count($parameter) == 2)
// {
// $element->{PARENT::VALUE_FIELD} = $parameter[0]; //
// $element->{PARENT::DESCRIPTION_FIELD} = $parameter[1]; //
// }
// //
// else if (is_string($parameter) || is_numeric($parameter))
// {
// $element->{PARENT::VALUE_FIELD} = $parameter; //
// $element->{PARENT::DESCRIPTION_FIELD} = $parameter; //
// }
// //
// else if (is_object($parameter) && isset($parameter->{PARENT::VALUE_FIELD})
// && isset($parameter->{PARENT::DESCRIPTION_FIELD}))
// {
// $element->{PARENT::VALUE_FIELD} = $parameter->{PARENT::VALUE_FIELD}; //
// $element->{PARENT::DESCRIPTION_FIELD} = $parameter->{PARENT::DESCRIPTION_FIELD}; //
// }
//
// array_push($tmpElements, $element); //
// }
// }
//
// $this->setValuesArray(success($tmpElements));
//
// $this->loadCheckboxView();
//
// echo $this->content();
}
}