From a7b796466fa174e871ee49b46d09fa5ff7a931c5 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Tue, 15 Aug 2017 02:51:59 +0200 Subject: [PATCH] ObjectsController: fix set-related permissions --- library/Director/Web/Controller/ObjectsController.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/library/Director/Web/Controller/ObjectsController.php b/library/Director/Web/Controller/ObjectsController.php index 3bec590b..4876e9f4 100644 --- a/library/Director/Web/Controller/ObjectsController.php +++ b/library/Director/Web/Controller/ObjectsController.php @@ -31,7 +31,9 @@ abstract class ObjectsController extends ActionController protected function checkDirectorPermissions() { - $this->assertPermission('director/' . $this->getPluralBaseType()); + if ($this->getRequest()->getActionName() !== 'sets') { + $this->assertPermission('director/' . $this->getPluralBaseType()); + } } /** * @return $this @@ -259,7 +261,7 @@ abstract class ObjectsController extends ActionController $type = $this->getType(); $tType = $this->translate(ucfirst($type)); $this - ->assertPermission('director/admin') + ->assertPermission('director/' . $this->getBaseType() . '_sets') ->addObjectsTabs() ->requireSupportFor('Sets') ->setAutorefreshInterval(10) @@ -268,9 +270,7 @@ abstract class ObjectsController extends ActionController $tType ); - $this->actions()/*->add( - $this->getBackToDashboardLink() - )*/->add( + $this->actions()->add( Link::create( $this->translate('Add'), "director/${type}set/add",