TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix saving of translations in relation controller by re-using the form widget's model (#4822) 

This PR is an addition to https://github.com/octobercms/october/pull/4193

Re-using the pivotWidget's and manageWidget's models for saving form data fixes https://github.com/rainlab/translate-plugin/issues/209, where translations are not saved for the model when editing it in a relation widget.

I did some manual testing with this change and everything was working as expected: Translations are now properly saved when creating or editing related models with pivot data. Creating related models in `single` mode now works as well.

Credits to @alxy for his previous work on this issue!
This commit is contained in:
Tobias Kündig 2020-03-31 19:44:13 +02:00 committed by GitHub
parent 802d8c8e09
commit 6e25c5a8d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1110,7 +1110,7 @@ class RelationController extends ControllerBehavior
$this->relationObject->add($newModel, $sessionKey);
}
elseif ($this->viewMode == 'single') {
$newModel = $this->viewModel;
$newModel = $this->manageWidget->model;
$this->viewWidget->setFormValues($saveData);
/*
@ -1154,6 +1154,8 @@ class RelationController extends ControllerBehavior
}
}
elseif ($this->viewMode == 'single') {
$this->viewModel = $this->manageWidget->model;
$this->viewWidget->setFormValues($saveData);
$this->viewModel->save(null, $this->manageWidget->getSessionKey());
}
@ -1364,7 +1366,7 @@ class RelationController extends ControllerBehavior
$this->beforeAjax();
$foreignKeyName = $this->relationModel->getQualifiedKeyName();
$hydratedModel = $this->relationObject->where($foreignKeyName, $this->manageId)->first();
$hydratedModel = $this->pivotWidget->model;
$saveData = $this->pivotWidget->getSaveData();
$modelsToSave = $this->prepareModelsToSave($hydratedModel, $saveData);