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

#62: Don't clobber the $albums variables in the navbar, so it now shows all albums not just the single page you're currently viewing

Browse Source
This commit is contained in:
Andy Heathershaw 2018-07-11 08:00:40 +01:00
parent 04d1e59778
commit cc3370c4b1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Middleware/GlobalConfiguration.php
View File

@ -63,7 +63,7 @@ class GlobalConfiguration
private function addAlbumsToView() private function addAlbumsToView()
{ {
$albums = DbHelper::getAlbumsForCurrentUser_NonPaged()->get(); $albums = DbHelper::getAlbumsForCurrentUser_NonPaged()->get();
View::share('albums', $albums); View::share('g_albums', $albums);
$albumsToUpload = DbHelper::getAlbumsForCurrentUser_NonPaged('upload-photos')->get(); $albumsToUpload = DbHelper::getAlbumsForCurrentUser_NonPaged('upload-photos')->get();
View::share('g_albums_upload', $albumsToUpload); View::share('g_albums_upload', $albumsToUpload);

2
resources/views/themes/base/partials/navbar.blade.php
View File

@ -20,7 +20,7 @@
<i class="fa fa-book"></i> @lang('navigation.navbar.albums') <i class="fa fa-book"></i> @lang('navigation.navbar.albums')
</a> </a>
<div class="dropdown-menu"> <div class="dropdown-menu">
@foreach ($albums as $album) @foreach ($g_albums as $album)
<a class="dropdown-item" href="{{ $album->url() }}">{{ $album->name }}</a> <a class="dropdown-item" href="{{ $album->url() }}">{{ $album->name }}</a>
@endforeach @endforeach
</div> </div>