widgets form validation bug fixed

Author: jcheron

Ajax/common/Widget.php

@@ -48,13 +48,16 @@ abstract class Widget extends HtmlDoubleElement {
 	 */
 	protected $_form;
 
+	protected $_generated;
+
 
 	public function __construct($identifier,$model,$modelInstance=NULL) {
 		parent::__construct($identifier);
 		$this->_template="%wrapContentBefore%%content%%wrapContentAfter%";
 		$this->setModel($model);
 		if(isset($modelInstance));
 			$this->show($modelInstance);
+		$this->_generated=false;
 	}
 
 	protected function _init($instanceViewer,$contentKey,$content,$edition){
@@ -336,7 +339,7 @@ public function getForm() {
 	public function run(JsUtils $js){
 		$result=parent::run($js);
 		if(isset($this->_form)){
-			$this->runForm($js);
+			$result=$this->runForm($js);
 		}
 		return $result;
 	}

Ajax/common/html/BaseHtml.php

@@ -110,7 +110,7 @@ protected function ctrl($name, $value, $typeCtrl) {
 		return true;
 	}
 
-	protected function propertyContains($propertyName, $value) {
+	public function propertyContains($propertyName, $value) {
 		$values=$this->getProperty($propertyName);
 		if (isset($values)) {
 			return JString::contains($values, $value);

Ajax/semantic/html/collections/form/HtmlForm.php

@@ -190,4 +190,9 @@ public function getValidationParams() {
 		return $this->_validationParams;
 	}
 
+	public function removeValidationParam($param){
+		unset($this->_validationParams[$param]);
+		return $this;
+	}
+
 }

Ajax/semantic/html/collections/form/traits/FormTrait.php

@@ -29,9 +29,9 @@ protected function _runValidationParams(&$compo,JsUtils $js=NULL){
 			$compilation=$params["_ajaxSubmit"]->compile($js);
 			$compilation=str_ireplace("\"","%quote%", $compilation);
 			$this->onSuccess($compilation);
-			unset($params["_ajaxSubmit"]);
+			$form->removeValidationParam("_ajaxSubmit");
 		}
-		$compo->addParams($params);
+		$compo->addParams($form->getValidationParams());
 		$form->setBsComponent($compo);
 		$form->addEventsOnRun($js);
 	}

Ajax/semantic/widgets/base/FieldAsTrait.php

@@ -238,6 +238,6 @@ public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=N
 			$button=new HtmlButton($id,$value,$cssStyle);
 			$this->_buttonAsSubmit($button,"click",$url,$responseElement);
 			return $button;
-		}, $index,$attributes);
+		}, $index,$attributes,"submit");
 	}
 }

Ajax/semantic/widgets/dataelement/DataElement.php

@@ -25,16 +25,19 @@ public function __construct($identifier, $modelInstance=NULL) {
 	}
 
 	public function compile(JsUtils $js=NULL,&$view=NULL){
-		$this->_instanceViewer->setInstance($this->_modelInstance);
+		if(!$this->_generated){
+			$this->_instanceViewer->setInstance($this->_modelInstance);
 
-		$table=$this->content["table"];
-		$this->_generateContent($table);
+			$table=$this->content["table"];
+			$this->_generateContent($table);
 
-		if(isset($this->_toolbar)){
-			$this->_setToolbarPosition($table);
+			if(isset($this->_toolbar)){
+				$this->_setToolbarPosition($table);
+			}
+			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
+			$this->_compileForm();
+			$this->_generated=true;
 		}
-		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
-		$this->_compileForm();
 		return parent::compile($js,$view);
 	}
 

Ajax/semantic/widgets/datatable/DataTable.php

@@ -60,37 +60,40 @@ protected function getTable() {
 
 
 	public function compile(JsUtils $js=NULL,&$view=NULL){
-		$this->_instanceViewer->setInstance($this->_model);
-		$captions=$this->_instanceViewer->getCaptions();
+		if(!$this->_generated){
+			$this->_instanceViewer->setInstance($this->_model);
+			$captions=$this->_instanceViewer->getCaptions();
 
-		$table=$this->content["table"];
+			$table=$this->content["table"];
 
-		if($this->_hasCheckboxes){
-			$this->_generateMainCheckbox($captions);
-		}
+			if($this->_hasCheckboxes){
+				$this->_generateMainCheckbox($captions);
+			}
 
-		$table->setRowCount(0, \sizeof($captions));
-		$table->setHeaderValues($captions);
-		if(isset($this->_compileParts))
-			$table->setCompileParts($this->_compileParts);
-		if(isset($this->_searchField) && isset($js)){
-			$this->_searchField->postOn("change", $this->_urls,"{'s':$(this).val()}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]);
-		}
+			$table->setRowCount(0, \sizeof($captions));
+			$table->setHeaderValues($captions);
+			if(isset($this->_compileParts))
+				$table->setCompileParts($this->_compileParts);
+			if(isset($this->_searchField) && isset($js)){
+				$this->_searchField->postOn("change", $this->_urls,"{'s':$(this).val()}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]);
+			}
 
-		$this->_generateContent($table);
+			$this->_generateContent($table);
 
-		if($this->_hasCheckboxes && $table->hasPart("thead")){
-				$table->getHeader()->getCell(0, 0)->addToProperty("class","no-sort");
-		}
+			if($this->_hasCheckboxes && $table->hasPart("thead")){
+					$table->getHeader()->getCell(0, 0)->addToProperty("class","no-sort");
+			}
 
-		if(isset($this->_pagination) && $this->_pagination->getVisible()){
-			$this->_generatePagination($table);
-		}
-		if(isset($this->_toolbar)){
-			$this->_setToolbarPosition($table, $captions);
+			if(isset($this->_pagination) && $this->_pagination->getVisible()){
+				$this->_generatePagination($table);
+			}
+			if(isset($this->_toolbar)){
+				$this->_setToolbarPosition($table, $captions);
+			}
+			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
+			$this->_compileForm();
+			$this->_generated=true;
 		}
-		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
-		$this->_compileForm();
 		return parent::compile($js,$view);
 	}
 
@@ -296,7 +299,7 @@ public function insertInFieldButton($index,$caption,$visibleHover=true,$callback
 	}
 
 	private function addDefaultButton($icon,$class=null,$visibleHover=true,$callback=null){
-		$this->addField($this->getCallable("getDefaultButton",[$icon,$class],$visibleHover,$callback));
+		$this->addField($this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback));
 		return $this;
 	}