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

Fix error messages in RelationController

Browse Source 
Fixes #4342
This commit is contained in:
Luke Towers 2019-06-12 00:26:55 -06:00
parent 882f317cd8
commit 71241ee6d4
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
modules/backend/behaviors/RelationController.php
View File

@ -320,17 +320,16 @@ class RelationController extends ControllerBehavior
}
if (!$this->model) {
throw new ApplicationException(Lang::get(
'backend::lang.relation.missing_model',
['class'=>get_class($this->controller)]
));
throw new ApplicationException(Lang::get('backend::lang.relation.missing_model', [
'class' => get_class($this->controller),
]));
}
if (!$this->model instanceof Model) {
throw new ApplicationException(Lang::get(
'backend::lang.model.invalid_class',
['model'=>get_class($this->model), 'class'=>get_class($this->controller)]
));
throw new ApplicationException(Lang::get('backend::lang.model.invalid_class', [
'model' => get_class($this->model),
'class' => get_class($this->controller),
]));
}
if (!$this->getConfig($field)) {
@ -901,10 +900,13 @@ class RelationController extends ControllerBehavior
* Existing record
*/
if ($this->manageId) {
$config->model = $config->model->find($this->manageId);
if (!$config->model) {
$model = $config->model->find($id);
if ($model) {
$config->model = $model;
} else {
throw new ApplicationException(Lang::get('backend::lang.model.not_found', [
'class' => get_class($config->model), 'id' => $this->manageId
'class' => get_class($config->model),
'id' => $this->manageId,
]));
}
}
@ -950,10 +952,12 @@ class RelationController extends ControllerBehavior
if ($this->manageId) {
$hydratedModel = $this->relationObject->where($foreignKeyName, $this->manageId)->first();
$config->model = $hydratedModel;
if (!$config->model) {
if ($hydratedModel) {
$config->model = $hydratedModel;
} else {
throw new ApplicationException(Lang::get('backend::lang.model.not_found', [
'class' => get_class($config->model), 'id' => $this->manageId
'class' => get_class($config->model),
'id' => $this->manageId,
]));
}
}