Merge pull request #6 from technicalguru/1.3-dev

Release 1.3.3

Author: technicalguru

src/WebApp/BootstrapTheme/DynamicFieldRenderer.php

@@ -40,7 +40,7 @@ protected function renderRow($idExt, $value, $isTemplate) {
 				else $child->setValue($value->$name);
 			}
 			$child->setId($id.'-'.$idExt);
-			$child->setName($name.'[]');
+			$child->setArray(true);
 			$label = $child->getLabel();
 			if ($label != NULL) {
 				$s   = $isTemplate ? 'display: none;' : '';

src/WebApp/BootstrapTheme/I18nFormElementRenderer.php

@@ -12,7 +12,7 @@ public function __construct($theme, $component) {
 	public function render() {
 		$languages = $this->component->getLanguages();
 		$cId       = $this->component->getId();
-		$cName     = $this->component->getBaseName();
+		$cName     = $this->component->getName();
 		$isArray   = $this->component->isArray();
 		if (count($languages) > 1) {
 			$tabSet = new \WebApp\Component\TabSet(NULL, $cId);

src/WebApp/BootstrapTheme/I18nTextInputRenderer.php

@@ -11,6 +11,7 @@ public function __construct($theme, $component) {
 	protected function createFormElement($languageKey, $id, $name) {
 		$rc = new \WebApp\Component\TextInput(NULL, $id, $this->component->getValue($languageKey));
 		$rc->setName($name);
+		if ($this->component->isArray()) $rc->setArray(TRUE);
 		$rc->setEnabled($this->component->isEnabled());
 		$rc->setRequired($this->component->isRequired());
 		$rc->setPlaceholder($this->component->getPlaceholder());

src/WebApp/Component/FormElement.php

@@ -7,6 +7,7 @@
 class FormElement extends Container {
 
 	protected $label;
+	protected $isArray;
 	protected $help;
 	protected $group;
 	protected $hidden;
@@ -17,7 +18,8 @@ public function __construct($parent, $id) {
 			$this->setId($id);
 			$this->setName($id);
 		}
-		$this->hidden = FALSE;
+		$this->hidden  = FALSE;
+		$this->isArray = FALSE;
 	}
 
 	public function hide() {
@@ -50,6 +52,17 @@ public function setHelp($value) {
 		return $this;
 	}
 
+	public function isArray() {
+		return $this->isArray;
+	}
+
+	public function setArray($value) {
+		$this->isArray = $value;
+		foreach ($this->getChildren() AS $child) {
+			if (method_exists($child, 'setArray')) $child->setArray($value);
+		}
+	}
+
 	public function getName() {
 		return $this->getAttribute('name', TRUE, $this->getId());
 	}
@@ -59,17 +72,9 @@ public function setName($name) {
 		return $this;
 	}
 
-	public function getBaseName() {
-		$rc = $this->getName();
-		if (mb_strpos($this->getName(), '[]') > 0) {
-			$rc = mb_substr($rc, 0, mb_strlen($rc)-2);
-		}
-		return $rc;
-	}
-
-	public function isArray() {
-		return mb_strpos($this->getName(), '[]') > 0;
-	}
+	//public function isArray() {
+	//	return mb_strpos($this->getName(), '[]') > 0;
+	//}
 
 	public function isEnabled() {
 		return $this->getAttribute('disabled', TRUE) != 'disabled';

src/WebApp/DataModel/Address.php

@@ -30,13 +30,13 @@ public static function isAddressComplete($address, $includeName = FALSE) {
 
 	public static function toSingleLine($address, $language = NULL) {
 		$rc = '';
-		if (!Utils::isEmpty($address->name))    $rc .= ', '.$address->name;
-		if (!Utils::isEmpty($address->country)) $rc .= ', '.I18N::_($address->country, $language);
-		if (!Utils::isEmpty($address->province))$rc .= ', '.$address->province;
-		if (!Utils::isEmpty($address->city))    $rc .= ', '.$address->city;
-		if (!Utils::isEmpty($address->zipCode)) $rc .= ', '.$address->zipCode;
-		if (!Utils::isEmpty($address->street1)) $rc .= ', '.$address->street1;
-		if (!Utils::isEmpty($address->street2)) $rc .= ', '.$address->street2;
+		if (isset($address->name)     && !Utils::isEmpty($address->name))    $rc .= ', '.$address->name;
+		if (isset($address->country)  && !Utils::isEmpty($address->country)) $rc .= ', '.I18N::_($address->country, $language);
+		if (isset($address->province) && !Utils::isEmpty($address->province))$rc .= ', '.$address->province;
+		if (isset($address->city)     && !Utils::isEmpty($address->city))    $rc .= ', '.$address->city;
+		if (isset($address->zipCode)  && !Utils::isEmpty($address->zipCode)) $rc .= ', '.$address->zipCode;
+		if (isset($address->street1)  && !Utils::isEmpty($address->street1)) $rc .= ', '.$address->street1;
+		if (isset($address->street2)  && !Utils::isEmpty($address->street2)) $rc .= ', '.$address->street2;
 		return substr($rc, 2);
 	}
 }

src/WebApp/Renderer.php

@@ -203,6 +203,9 @@ public function computeFinalAttributes() {
 		$attributes = $this->getAttributes(TRUE);
 		unset($attributes['class'], $attributes['style'], $attributes['id']);
 		foreach ($attributes AS $name => $value) {
+			if (($name == 'name') && (count($value) > 0) && method_exists($this->component, 'isArray') && $this->component->isArray()) {
+				$value = array($value[0].'[]');
+			}
 			$rc[$name] = $value;
 		}
 		return $rc;