post params bug fixed + checked list names

Author: jcheron

Ajax/common/html/traits/BaseHtmlEventsTrait.php

@@ -138,7 +138,14 @@ public function getOnClick($url, $responseElement="", $parameters=array()) {
 	}
 
 	public function postOn($event, $url, $params="{}", $responseElement="", $parameters=array()) {
-		$parameters["params"]=$params;
+		$allParameters=[];
+		if(isset($parameters["params"])){
+			$allParameters[]=JsUtils::_correctParams($parameters["params"]);
+		}
+		if(isset($params)){
+			$allParameters[]=JsUtils::_correctParams($params);
+		}
+		$parameters["params"]=\implode("+'&'+", $allParameters);
 		return $this->_ajaxOn("post", $event, $url, $responseElement, $parameters);
 	}
 

Ajax/common/traits/JsUtilsAjaxTrait.php

@@ -19,15 +19,14 @@ abstract public function getUrl($url);
 	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
 
 	protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$jqueryDone="html",$ajaxTransition=null,$immediatly=false) {
-		if(JString::isNull($params)){$params="{}";}
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$responseElement=$this->_getResponseElement($responseElement);
 		$retour.="var self=this;\n";
 		if($hasLoader===true){
 			$this->addLoading($retour, $responseElement);
 		}
-		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
+		$retour.="$.".$method."(url,".self::_correctParams($params).").done(function( data ) {\n";
 		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";
 		if ($immediatly)
 			$this->jquery_code_for_compile[]=$retour;
@@ -86,9 +85,19 @@ protected function _correctAjaxUrl($url) {
 			return $url;
 	}
 
+	public static function _correctParams($params){
+		if(JString::isNull($params)){
+			return "";
+		}
+		if(\preg_match("@^\{.*?\}$@", $params)){
+			return '$.param('.$params.')';
+		}
+		return $params;
+	}
+
 	protected function addLoading(&$retour, $responseElement) {
 		$loading_notifier='<div class="ajax-loader">';
-		if ($this->ajaxLoader=='') {
+		if ($this->ajaxLoader==='') {
 			$loading_notifier.="Loading...";
 		} else {
 			$loading_notifier.=$this->ajaxLoader;
@@ -469,7 +478,7 @@ private function _postForm($url, $form, $responseElement, $params=null,$validati
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$retour.="\nvar params=$('#".$form."').serialize();\n";
 		if(isset($params)){
-			$retour.="params+='&'+$.param(".$params.");\n";
+			$retour.="params+='&'+".self::_correctParams($params).";\n";
 		}
 		$responseElement=$this->_getResponseElement($responseElement);
 		$retour.="var self=this;\n";

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

@@ -46,6 +46,11 @@ public function getHtmlCk(){
 		return $this->content["field"];
 	}
 
+	public function setName($name){
+		$this->getDataField()->setProperty("name", $name);
+		return $this;
+	}
+
 	public function getDataField(){
 		$field= $this->getField();
 		if($field instanceof AbstractCheckbox)

Ajax/semantic/html/elements/HtmlList.php

@@ -100,12 +100,14 @@ public function setHorizontal() {
 	 * @param string $notAllChecked
 	 * @return HtmlList
 	 */
-	public function addCheckedList($items=array(), $masterItem=NULL, $values=array(),$notAllChecked=false) {
+	public function addCheckedList($items=array(), $masterItem=NULL, $values=array(),$notAllChecked=false,$name=null) {
 		$count=$this->count();
 		$identifier=$this->identifier . "-" . $count;
 		if (isset($masterItem)) {
 			if(\is_array($masterItem)){
 				$masterO=new HtmlFormCheckbox("master-" . $identifier, @$masterItem[0],@$masterItem[1]);
+				if(isset($name))
+					$masterO->setName($name);
 				if(isset($masterItem[1])){
 					if(\array_search($masterItem[1], $values)!==false){
 						$masterO->getDataField()->setProperty("checked", "");
@@ -128,6 +130,8 @@ public function addCheckedList($items=array(), $masterItem=NULL, $values=array()
 			if (\array_search($val, $values) !== false) {
 				$itemO->getDataField()->setProperty("checked", "");
 			}
+			if(isset($name))
+				$itemO->setName($name);
 			$itemO->setClass("item");
 			$fields[]=$itemO;
 		}