From f1c6b34d7ab34b7b8ae485771fa22a362cb4bfa1 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 18 Sep 2015 15:53:39 +0200 Subject: [PATCH] NavigationConfigForm: Automatically share childs if there parent is shared refs #5600 --- application/forms/Navigation/NavigationConfigForm.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/application/forms/Navigation/NavigationConfigForm.php b/application/forms/Navigation/NavigationConfigForm.php index 3f0269fbe..dc5c3509e 100644 --- a/application/forms/Navigation/NavigationConfigForm.php +++ b/application/forms/Navigation/NavigationConfigForm.php @@ -283,6 +283,9 @@ class NavigationConfigForm extends ConfigForm unset($data['users']); unset($data['groups']); } + } elseif (isset($data['parent']) && $data['parent'] && $this->hasBeenShared($data['parent'])) { + $data['owner'] = $this->getUser()->getUsername(); + $config = $this->getShareConfig(); } $itemName = $data['name']; @@ -334,6 +337,13 @@ class NavigationConfigForm extends ConfigForm unset($data['users']); unset($data['groups']); } + } elseif (isset($data['parent']) && $data['parent'] && $this->hasBeenShared($data['parent'])) { + // Its parent is shared so should it itself + $config->removeSection($name); + $this->secondaryConfig = $config; + $config = $this->getShareConfig(); + $data['owner'] = $this->getUser()->getUsername(); + $shared = true; } if (isset($data['name'])) {