From 33275a873348a9351927ac2c1cc67adeb1c02814 Mon Sep 17 00:00:00 2001 From: Andy Heathershaw Date: Fri, 14 Apr 2017 10:23:47 +0100 Subject: [PATCH] #3: Removed the dynamic-ness of the album permissions so I have more control over the layout --- app/Helpers/ThemeHelper.php | 13 +++++++++++++ .../base/partials/album_permissions.blade.php | 19 ++++++++++++++----- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/app/Helpers/ThemeHelper.php b/app/Helpers/ThemeHelper.php index 2f49809..f01e8b9 100644 --- a/app/Helpers/ThemeHelper.php +++ b/app/Helpers/ThemeHelper.php @@ -14,6 +14,19 @@ class ThemeHelper return $this->getThemeName(); } + public function getPermission($allPermissions, $section, $description) + { + foreach ($allPermissions as $permission) + { + if (strtolower($permission->section) == strtolower($section) && strtolower($permission->description) == strtolower($description)) + { + return $permission; + } + } + + return null; + } + public function hasStylesheet() { $cssFilename = sprintf('%s/%s/theme.css', $this->getThemePublicPath(), $this->getThemeName()); diff --git a/resources/views/themes/base/partials/album_permissions.blade.php b/resources/views/themes/base/partials/album_permissions.blade.php index e6ba826..e893465 100644 --- a/resources/views/themes/base/partials/album_permissions.blade.php +++ b/resources/views/themes/base/partials/album_permissions.blade.php @@ -8,15 +8,24 @@

Select All · Select None

+
+
+
Album Permissions
+ + @php ($permission = Theme::getPermission($all_permissions, 'album', 'list')) +
+ +
+
+
+ @foreach ($all_permissions as $permission) @if ($object_id == 'anonymous' && $permission->section == 'album' && $permission->description != 'list' && $permission->description != 'view') @continue @endif -
- -
+ @endforeach