From de2c9703dec5622aef1f4a342c5c3d960efdc0d1 Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Tue, 18 Jul 2017 12:48:20 +0200
Subject: [PATCH] UDF bugfixes

---
 application/libraries/WidgetLib.php | 56 -----------------------------
 application/widgets/UDFWidget.php   |  8 +----
 2 files changed, 1 insertion(+), 63 deletions(-)

diff --git a/application/libraries/WidgetLib.php b/application/libraries/WidgetLib.php
index b1da1670c..311bd3a90 100644
--- a/application/libraries/WidgetLib.php
+++ b/application/libraries/WidgetLib.php
@@ -1074,20 +1074,6 @@ class CheckboxWidget extends Widget
 	// this element is used to tell what element of the dropdown is selected
 	const CHECKED_ELEMENT = 'checkedElement';
 	
-	/**
-	 * 
-	 */
-	public function __construct($name, $args, $htmlArgs = array())
-	{
-		parent::__construct($name, $args, $htmlArgs);
-		
-		// 
-		if (!isset($this->_args[CheckboxWidget::CHECKED_ELEMENT]))
-		{
-			$this->_args[CheckboxWidget::CHECKED_ELEMENT] = Widget::HTML_DEFAULT_VALUE;
-		}
-	}
-	
 	/**
 	 * 
 	 */
@@ -1133,48 +1119,6 @@ class CheckboxWidgetUDF extends CheckboxWidget
 		$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();
     }
 }
 
diff --git a/application/widgets/UDFWidget.php b/application/widgets/UDFWidget.php
index b37bda18a..5bc51d911 100644
--- a/application/widgets/UDFWidget.php
+++ b/application/widgets/UDFWidget.php
@@ -283,15 +283,9 @@ class UDFWidget extends UDFWidgetTpl
 		{
 			$this->_args[CheckboxWidget::CHECKED_ELEMENT] = $this->_args[UDFWidgetTpl::UDFS_ARG_NAME][$jsonSchema->{UDFWidget::NAME}];
 		}
-		
-		// 
-		if (!isset($this->_args[CheckboxWidget::CHECKED_ELEMENT]))
-		{
-			$this->_args[CheckboxWidget::CHECKED_ELEMENT] = $jsonSchema->{UDFWidgetTpl::DEFAULT_VALUE};
-		}
 		else
 		{
-			$this->_args[CheckboxWidget::CHECKED_ELEMENT] = Widget::HTML_DEFAULT_VALUE;
+			$this->_args[CheckboxWidget::CHECKED_ELEMENT] = $jsonSchema->{UDFWidgetTpl::DEFAULT_VALUE};
 		}
 		
 		$checkboxWidgetUDF = new CheckboxWidgetUDF($this->_name, $this->_args);