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

Don't allow a record to be clicked if there is no form to display

This commit is contained in:
Samuel Georges 2015-04-06 16:57:53 +10:00
parent 93dd61efc7
commit 13b14729fd
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -561,6 +561,12 @@ class RelationController extends ControllerBehavior
if ($config->recordUrl) { if ($config->recordUrl) {
$defaultOnClick = null; $defaultOnClick = null;
} }
elseif (
!$this->makeConfigForMode('manage', 'form', false) &&
!$this->makeConfigForMode('pivot', 'form', false)
) {
$defaultOnClick = null;
}
$config->recordOnClick = $this->getConfig('view[recordOnClick]', $defaultOnClick); $config->recordOnClick = $this->getConfig('view[recordOnClick]', $defaultOnClick);
@ -1267,7 +1273,7 @@ class RelationController extends ControllerBehavior
* Returns the configuration for a mode (view, manage, pivot) for an * Returns the configuration for a mode (view, manage, pivot) for an
* expected type (list, form). Uses fallback configuration. * expected type (list, form). Uses fallback configuration.
*/ */
protected function makeConfigForMode($mode = 'view', $type = 'list') protected function makeConfigForMode($mode = 'view', $type = 'list', $throwException = true)
{ {
$config = null; $config = null;
@ -1293,12 +1299,16 @@ class RelationController extends ControllerBehavior
* - view.list => manage.list * - view.list => manage.list
*/ */
if (!$config) { if (!$config) {
if ($mode == 'manage' && $type == 'list') { if ($mode == 'manage' && $type == 'list') {
return $this->makeConfigForMode('view', $type); return $this->makeConfigForMode('view', $type);
} }
throw new ApplicationException('Missing configuration for '.$mode.'.'.$type.' in RelationController definition '.$this->field); if ($throwException) {
throw new ApplicationException('Missing configuration for '.$mode.'.'.$type.' in RelationController definition '.$this->field);
}
else {
return false;
}
} }
return $this->makeConfig($config); return $this->makeConfig($config);