Skip to content

Commit 22ba15a

Browse files
committed
separators...for form without fields declaration
1 parent 030ef0e commit 22ba15a

File tree

2 files changed

+23
-8
lines changed

2 files changed

+23
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ protected function _buttonAsSubmit($button,$event,$url,$responseElement=NULL){
5252
$form=$this->getForm();
5353
if(isset($url) && isset($responseElement)){
5454
$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');");
55-
$form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", ["form"=>$this->identifier,"responseElement"=>$responseElement,"url"=>$url]));
55+
$form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", ["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url]));
5656
}
5757
return $button;
5858
}

Ajax/semantic/widgets/dataform/DataForm.php

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,20 @@ protected function _generateContent($form){
4646
$values= $this->_instanceViewer->getValues();
4747
$count=$this->_instanceViewer->count();
4848
$separators=$this->_instanceViewer->getSeparators();
49-
$separators[]=$count;
50-
for($i=0;$i<\sizeof($separators)-1;$i++){
51-
$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
52-
if(\sizeof($fields)===1){
53-
$form->addField($fields[0]);
54-
}else
55-
$form->addFields($fields);
49+
$size=\sizeof($separators);
50+
if($size===1){
51+
foreach ($values as $v){
52+
$form->addField($v);
53+
}
54+
}else{
55+
$separators[]=$count;
56+
for($i=0;$i<$size-1;$i++){
57+
$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
58+
if(\sizeof($fields)===1){
59+
$form->addField($fields[0]);
60+
}else
61+
$form->addFields($fields);
62+
}
5663
}
5764
}
5865

@@ -91,6 +98,14 @@ public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=N
9198
}, $index,$attributes);
9299
}
93100

101+
public function fieldAsReset($index,$cssStyle=NULL,$attributes=NULL){
102+
return $this->_fieldAs(function($id,$name,$value,$caption) use ($cssStyle){
103+
$button=new HtmlButton($id,$value,$cssStyle);
104+
$button->setProperty("type", "reset");
105+
return $button;
106+
}, $index,$attributes);
107+
}
108+
94109
/**
95110
* {@inheritDoc}
96111
* @see \Ajax\common\Widget::getHtmlComponent()

0 commit comments

Comments
 (0)