mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Fixes formExtendModel method so it actually works.

Browse Source 
The extension must occur after the ::find() method, which will return a fresh object. When it occurs before, any changes to the model are lost. Where this may have prior been used to dynamically return a different model, the formCreateModelObject override method should return this value now.
This commit is contained in:
Samuel Georges 2016-02-10 19:38:35 +11:00
parent 03e7c19a5d
commit cd055ad437
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/backend/behaviors/FormController.php
View File

@ -180,6 +180,8 @@ class FormController extends ControllerBehavior
);
$model = $this->controller->formCreateModelObject();
$model = $this->controller->formExtendModel($model);
$this->initForm($model);
}
catch (Exception $ex) {
@ -364,8 +366,6 @@ class FormController extends ControllerBehavior
{
$class = $this->config->modelClass;
$model = new $class();
$model = $this->controller->formExtendModel($model);
return $model;
}
@ -571,7 +571,6 @@ class FormController extends ControllerBehavior
{
}
/**
* Finds a Model record by its primary identifier, used by update actions. This logic
* can be changed by overriding it in the controller.
@ -584,7 +583,7 @@ class FormController extends ControllerBehavior
throw new ApplicationException($this->getLang('not-found-message', 'backend::lang.form.missing_id'));
}
$model = $this->createModel();
$model = $this->controller->formCreateModelObject();
/*
* Prepare query and find model record
@ -599,12 +598,14 @@ class FormController extends ControllerBehavior
]));
}
$result = $this->controller->formExtendModel($result);
return $result;
}
/**
* Creates a new instance of a form model, used by create actions. This logic
* can be changed by overriding it in the controller.
* Creates a new instance of a form model. This logic can be changed
* by overriding it in the controller.
* @return Model
*/
public function formCreateModelObject()