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

#11: URL aliases used by albums are now updated when the parent is changed. Added a warning to the Edit page that this may break links.

Browse Source
This commit is contained in:
Andy Heathershaw 2017-09-03 08:40:39 +01:00
parent 89d9c31ba8
commit 2f1cbfc16c
4 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Album.php
View File

@ -200,6 +200,7 @@ class Album extends Model
if (is_null($this->url_path)) if (is_null($this->url_path))
{ {
$this->generateUrlPath(); $this->generateUrlPath();
$this->save();
} }
return route('viewAlbum', $this->url_path); return route('viewAlbum', $this->url_path);

9
app/Http/Controllers/Admin/AlbumController.php
View File

@ -408,6 +408,7 @@ class AlbumController extends Controller
$album->user_id = Auth::user()->id; $album->user_id = Auth::user()->id;
$album->generateAlias(); $album->generateAlias();
$album->generateUrlPath();
$album->save(); $album->save();
// Link all default permissions to anonymous users (if a public album) // Link all default permissions to anonymous users (if a public album)
@ -440,6 +441,8 @@ class AlbumController extends Controller
$this->authorizeAccessToAdminPanel('admin:manage-albums'); $this->authorizeAccessToAdminPanel('admin:manage-albums');
$album = $this->loadAlbum($id); $album = $this->loadAlbum($id);
$currentParentID = $album->parent_album_id;
$album->fill($request->only(['name', 'description', 'parent_album_id'])); $album->fill($request->only(['name', 'description', 'parent_album_id']));
if (strlen($album->parent_album_id) == 0) if (strlen($album->parent_album_id) == 0)
@ -456,6 +459,12 @@ class AlbumController extends Controller
} }
} }
// Re-generate the URL path to ensure it's correct if the parent has changed
if ($currentParentID != $album->parent_album_id)
{
$album->generateUrlPath();
}
$album->save(); $album->save();
$request->session()->flash('success', trans('admin.album_saved_successfully', ['name' => $album->name])); $request->session()->flash('success', trans('admin.album_saved_successfully', ['name' => $album->name]));

1
resources/lang/en/admin.php
View File

@ -75,6 +75,7 @@ return [
'delete_user_warning' => 'This is a permanent action that cannot be reversed!', 'delete_user_warning' => 'This is a permanent action that cannot be reversed!',
'edit_album' => 'Edit photo album: :album_name', 'edit_album' => 'Edit photo album: :album_name',
'edit_album_action' => 'Edit album details', 'edit_album_action' => 'Edit album details',
'edit_album_change_parent_warning' => 'Changing this album\'s parent will change the address used to access this album. This may break any bookmarks or links used by your visitors or search engines.',
'edit_album_intro' => 'Photo albums contain individual photographs in the same way as a physical photo album or memory book.', 'edit_album_intro' => 'Photo albums contain individual photographs in the same way as a physical photo album or memory book.',
'edit_album_intro2' => 'Complete the form below to edit the properties of the album: :album_name.', 'edit_album_intro2' => 'Complete the form below to edit the properties of the album: :album_name.',
'edit_group_intro' => 'You can use the form below to edit the above group. Changes take effect immediately.', 'edit_group_intro' => 'You can use the form below to edit the above group. Changes take effect immediately.',

4
resources/views/themes/base/admin/edit_album.blade.php
View File

@ -54,6 +54,10 @@
</select> </select>
</div> </div>
<div class="alert alert-warning">
@lang('admin.edit_album_change_parent_warning')
</div>
<div class="text-right"> <div class="text-right">
<a href="{{ route('albums.show', ['id' => $album->id]) }}" class="btn btn-link">@lang('forms.cancel_action')</a> <a href="{{ route('albums.show', ['id' => $album->id]) }}" class="btn btn-link">@lang('forms.cancel_action')</a>
<button type="submit" class="btn btn-success"><i class="fa fa-fw fa-check"></i> @lang('forms.save_action')</button> <button type="submit" class="btn btn-success"><i class="fa fa-fw fa-check"></i> @lang('forms.save_action')</button>