aheathershaw
/
blue-twilight
1
0
Fork 0
Code Issues 32 Pull Requests Releases 15 Wiki Activity

Reverted an erroneous change that shouldn't have happened from git committing on the server

This commit is contained in:
Andy Heathershaw 2017-09-16 08:32:23 +01:00
parent 0b64728d0a
commit 4f7ad41009
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Helpers/DbHelper.php
View File

@ -43,7 +43,7 @@ class DbHelper
return $query->paginate(UserConfig::get('items_per_page')); return $query->paginate(UserConfig::get('items_per_page'));
} }
public static function getAlbumsForCurrentUser_NonPaged() public static function getAlbumsForCurrentUser_NonPaged($permission = 'list')
{ {
$albumsQuery = Album::query(); $albumsQuery = Album::query();
$user = Auth::user(); $user = Auth::user();
@ -60,7 +60,7 @@ class DbHelper
->join('permissions', 'permissions.id', '=', 'album_anonymous_permissions.permission_id') ->join('permissions', 'permissions.id', '=', 'album_anonymous_permissions.permission_id')
->where([ ->where([
['permissions.section', 'album'], ['permissions.section', 'album'],
['permissions.description', 'list'] ['permissions.description', $permission]
]); ]);
} }
else else
@ -78,12 +78,12 @@ class DbHelper
->where('albums.user_id', $user->id) ->where('albums.user_id', $user->id)
->orWhere([ ->orWhere([
['group_permissions.section', 'album'], ['group_permissions.section', 'album'],
['group_permissions.description', 'list'], ['group_permissions.description', $permission],
['user_groups.user_id', $user->id] ['user_groups.user_id', $user->id]
]) ])
->orWhere([ ->orWhere([
['user_permissions.section', 'album'], ['user_permissions.section', 'album'],
['user_permissions.description', 'list'], ['user_permissions.description', $permission],
['album_user_permissions.user_id', $user->id] ['album_user_permissions.user_id', $user->id]
]); ]);
} }