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

Allow passing arbitrary recordUrl to relationRender

This commit is contained in:
Samuel Georges 2016-09-27 20:39:29 +10:00
parent 0d336151d2
commit baefa3e50d
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -311,7 +311,7 @@ class RelationController extends ControllerBehavior
} }
if ($extraConfig = post(self::PARAM_EXTRA_CONFIG)) { if ($extraConfig = post(self::PARAM_EXTRA_CONFIG)) {
$this->applyExtraConfig($field, $extraConfig); $this->applyExtraConfig($extraConfig);
} }
$this->alias = camel_case('relation ' . $field); $this->alias = camel_case('relation ' . $field);
@ -398,10 +398,10 @@ class RelationController extends ControllerBehavior
/* /*
* Apply options and extra config * Apply options and extra config
*/ */
$allowConfig = ['readOnly']; $allowConfig = ['readOnly', 'recordUrl'];
if ($extraConfig = array_only($options, $allowConfig)) { if ($extraConfig = array_only($options, $allowConfig)) {
$this->extraConfig = $extraConfig; $this->extraConfig = $extraConfig;
$this->applyExtraConfig($field, $extraConfig); $this->applyExtraConfig($extraConfig, $field);
} }
/* /*
@ -1504,12 +1504,19 @@ class RelationController extends ControllerBehavior
/** /**
* Apply extra configuration * Apply extra configuration
*/ */
protected function applyExtraConfig($field, $config) protected function applyExtraConfig($config, $field = null)
{ {
if (!$field) {
$field = $this->field;
}
$parsedConfig = array_only($config, ['readOnly']);
$parsedConfig['view'] = array_only($config, ['recordUrl']);
if (is_array($config) && isset($this->originalConfig->{$field})) { if (is_array($config) && isset($this->originalConfig->{$field})) {
$this->originalConfig->{$field} = array_merge( $this->originalConfig->{$field} = array_merge_recursive(
$this->originalConfig->{$field}, $this->originalConfig->{$field},
$config $parsedConfig
); );
} }
} }