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

Encode extra config to isolate the logic 

Fixes #2417
This commit is contained in:
Samuel Georges 2016-10-15 10:10:11 +11:00
parent 7b8f17e6d1
commit 8eafcaa090
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1509,15 +1509,24 @@ class RelationController extends ControllerBehavior
$field = $this->field; $field = $this->field;
} }
if (!$config || !isset($this->originalConfig->{$field})) {
return;
}
if (
!is_array($config) &&
(!$config = @json_decode(@base64_decode($config), true))
) {
return;
}
$parsedConfig = array_only($config, ['readOnly']); $parsedConfig = array_only($config, ['readOnly']);
$parsedConfig['view'] = array_only($config, ['recordUrl']); $parsedConfig['view'] = array_only($config, ['recordUrl']);
if (is_array($config) && isset($this->originalConfig->{$field})) { $this->originalConfig->{$field} = array_replace_recursive(
$this->originalConfig->{$field} = array_merge_recursive( $this->originalConfig->{$field},
$this->originalConfig->{$field}, $parsedConfig
$parsedConfig );
);
}
} }
/** /**

2
modules/backend/behaviors/relationcontroller/partials/_container.htm
View File

@ -1,6 +1,6 @@
<div <div
id="<?= $this->relationGetId() ?>" id="<?= $this->relationGetId() ?>"
data-request-data="_relation_field: '<?= $relationField ?>', _relation_extra_config: <?= e(json_encode($relationExtraConfig)) ?>" data-request-data="_relation_field: '<?= $relationField ?>', _relation_extra_config: '<?= e(base64_encode(json_encode($relationExtraConfig))) ?>'"
class="relation-behavior relation-view-<?= $relationViewMode ?>"> class="relation-behavior relation-view-<?= $relationViewMode ?>">
<?php if ($toolbar = $this->relationRenderToolbar()): ?> <?php if ($toolbar = $this->relationRenderToolbar()): ?>