From 4f7ad41009b0af39eed06721931ea655e4b49655 Mon Sep 17 00:00:00 2001 From: Andy Heathershaw Date: Sat, 16 Sep 2017 08:32:23 +0100 Subject: [PATCH] Reverted an erroneous change that shouldn't have happened from git committing on the server --- app/Helpers/DbHelper.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Helpers/DbHelper.php b/app/Helpers/DbHelper.php index ff61fd4..353d500 100644 --- a/app/Helpers/DbHelper.php +++ b/app/Helpers/DbHelper.php @@ -43,7 +43,7 @@ class DbHelper return $query->paginate(UserConfig::get('items_per_page')); } - public static function getAlbumsForCurrentUser_NonPaged() + public static function getAlbumsForCurrentUser_NonPaged($permission = 'list') { $albumsQuery = Album::query(); $user = Auth::user(); @@ -60,7 +60,7 @@ class DbHelper ->join('permissions', 'permissions.id', '=', 'album_anonymous_permissions.permission_id') ->where([ ['permissions.section', 'album'], - ['permissions.description', 'list'] + ['permissions.description', $permission] ]); } else @@ -78,12 +78,12 @@ class DbHelper ->where('albums.user_id', $user->id) ->orWhere([ ['group_permissions.section', 'album'], - ['group_permissions.description', 'list'], + ['group_permissions.description', $permission], ['user_groups.user_id', $user->id] ]) ->orWhere([ ['user_permissions.section', 'album'], - ['user_permissions.description', 'list'], + ['user_permissions.description', $permission], ['album_user_permissions.user_id', $user->id] ]); }