@@ -22,36 +22,30 @@ trait FormTrait{
22
22
*/
23
23
abstract protected function getForm ();
24
24
25
- protected $ _runnedParams =false ;
26
25
27
26
protected function addCompoValidation (Form $ compo ,HtmlFormField $ field ){
28
27
$ validation =$ field ->getValidation ();
29
28
if (isset ($ validation )){
30
29
$ validation ->setIdentifier ($ field ->getDataField ()->getIdentifier ());
31
30
$ compo ->addFieldValidation ($ validation );
32
31
}
33
- return $ compo ;
34
32
}
35
33
36
34
protected function addExtraCompoValidation (Form $ compo ,FieldValidation $ validation ){
37
35
$ compo ->addFieldValidation ($ validation );
38
- return $ compo ;
39
36
}
40
37
41
38
protected function _runValidationParams (Form &$ compo ,JsUtils $ js =NULL ){
42
- if (!$ this ->_runnedParams ){
43
- $ form =$ this ->getForm ();
44
- $ params =$ form ->getValidationParams ();
45
- if (isset ($ params ["_ajaxSubmit " ])){
46
- $ compilation =$ this ->_compileAjaxSubmit ($ params ["_ajaxSubmit " ],$ js );
47
- $ this ->onSuccess ($ compilation );
48
- $ form ->removeValidationParam ("_ajaxSubmit " );
49
- }
50
- $ compo ->addParams ($ form ->getValidationParams ());
51
- $ form ->setBsComponent ($ compo );
52
- $ form ->addEventsOnRun ($ js );
53
- $ this ->_runnedParams =true ;
39
+ $ form =$ this ->getForm ();
40
+ $ params =$ form ->getValidationParams ();
41
+ if (isset ($ params ["_ajaxSubmit " ])){
42
+ $ compilation =$ this ->_compileAjaxSubmit ($ params ["_ajaxSubmit " ],$ js );
43
+ $ this ->onSuccess ($ compilation );
44
+ $ form ->removeValidationParam ("_ajaxSubmit " );
54
45
}
46
+ $ compo ->addParams ($ form ->getValidationParams ());
47
+ $ form ->setBsComponent ($ compo );
48
+ $ form ->addEventsOnRun ($ js );
55
49
}
56
50
57
51
protected function _compileAjaxSubmit ($ ajaxSubmit ,JsUtils $ js =null ){
0 commit comments