Merge permissions cache and inherited permissions #110

Merged
aheathershaw merged 10 commits from feature/71-permissions-cache into master 2018-09-16 22:19:38 +01:00
Showing only changes of commit 138cb91986 - Show all commits

View File

@ -164,7 +164,6 @@ class AlbumController extends Controller
$albumService = new AlbumService(); $albumService = new AlbumService();
return Theme::render('admin.edit_album', [ return Theme::render('admin.edit_album', [
'active_tab' => $request->get('tab'),
'album' => $album, 'album' => $album,
'parent_albums' => $albumService->getFlattenedAlbumTree() 'parent_albums' => $albumService->getFlattenedAlbumTree()
]); ]);