diff --git a/app/Http/Controllers/Admin/AlbumController.php b/app/Http/Controllers/Admin/AlbumController.php
index da86365..852fcd5 100644
--- a/app/Http/Controllers/Admin/AlbumController.php
+++ b/app/Http/Controllers/Admin/AlbumController.php
@@ -11,7 +11,6 @@ use App\Facade\Theme;
use App\Facade\UserConfig;
use App\Group;
use App\Helpers\DbHelper;
-use App\Helpers\FileHelper;
use App\Helpers\MiscHelper;
use App\Helpers\PermissionsHelper;
use App\Http\Controllers\Controller;
@@ -74,7 +73,7 @@ class AlbumController extends Controller
if (count($photos) == 0)
{
- return redirect(route('albums.show', ['id' => $album->id]));
+ return redirect(route('albums.show', ['album' => $album->id]));
}
return Theme::render('admin.analyse_album', ['album' => $album, 'photos' => $photos, 'queue_token' => $queue_token]);
@@ -171,7 +170,7 @@ class AlbumController extends Controller
$redirect->delete();
$request->session()->flash('success', trans('admin.delete_redirect_success_message'));
- return redirect(route('albums.show', ['id' => $id, 'tab' => 'redirects']));
+ return redirect(route('albums.show', ['album' => $id, 'tab' => 'redirects']));
}
/**
@@ -706,7 +705,7 @@ class AlbumController extends Controller
$helper = new PermissionsHelper();
$helper->rebuildCache();
- return redirect(route('albums.show', ['id' => $album->id]));
+ return redirect(route('albums.show', ['album' => $album->id]));
}
public function storeRedirect(Requests\StoreAlbumRedirectRequest $request, $id)
@@ -721,7 +720,7 @@ class AlbumController extends Controller
$redirect->save();
$request->session()->flash('success', trans('admin.create_redirect_success_message'));
- return redirect(route('albums.show', ['id' => $id, 'tab' => 'redirects']));
+ return redirect(route('albums.show', ['album' => $id, 'tab' => 'redirects']));
}
/**
@@ -783,7 +782,7 @@ class AlbumController extends Controller
$request->session()->flash('success', trans('admin.album_saved_successfully', ['name' => $album->name]));
- return redirect(route('albums.show', ['id' => $id]));
+ return redirect(route('albums.show', ['album' => $id]));
}
private function createActivityRecord(Album $album, $type, $activityDateTime = null)
diff --git a/app/Http/Controllers/Admin/PhotoCommentController.php b/app/Http/Controllers/Admin/PhotoCommentController.php
index efa1add..c35fe17 100644
--- a/app/Http/Controllers/Admin/PhotoCommentController.php
+++ b/app/Http/Controllers/Admin/PhotoCommentController.php
@@ -134,7 +134,7 @@ class PhotoCommentController extends Controller
if (count($commentIDs) == 1)
{
// Single comment selected - redirect to the single delete page
- return redirect(route('comments.delete', ['id' => $commentIDs[0]]));
+ return redirect(route('comments.delete', ['comment' => $commentIDs[0]]));
}
// Show the view to confirm the delete
@@ -148,7 +148,7 @@ class PhotoCommentController extends Controller
if (count($commentIDs) == 1)
{
// Single comment selected - redirect to the single approve page
- return redirect(route('comments.approve', ['id' => $commentIDs[0]]));
+ return redirect(route('comments.approve', ['comment' => $commentIDs[0]]));
}
// Show the view to confirm the approval
@@ -162,7 +162,7 @@ class PhotoCommentController extends Controller
if (count($commentIDs) == 1)
{
// Single comment selected - redirect to the single reject page
- return redirect(route('comments.reject', ['id' => $commentIDs[0]]));
+ return redirect(route('comments.reject', ['comment' => $commentIDs[0]]));
}
// Show the view to confirm the rejection
diff --git a/app/Http/Controllers/Admin/PhotoController.php b/app/Http/Controllers/Admin/PhotoController.php
index 36fc63e..ff4509e 100644
--- a/app/Http/Controllers/Admin/PhotoController.php
+++ b/app/Http/Controllers/Admin/PhotoController.php
@@ -392,7 +392,7 @@ class PhotoController extends Controller
else
{
return redirect(route('albums.analyse', [
- 'id' => $album->id,
+ 'album' => $album->id,
'queue_token' => $queueUid
]));
}
@@ -408,7 +408,7 @@ class PhotoController extends Controller
if (is_null($request->files->get('archive')))
{
$request->session()->flash('error', trans('admin.upload_bulk_no_file'));
- return redirect(route('albums.show', ['id' => $album->id]));
+ return redirect(route('albums.show', ['album' => $album->id]));
}
$archiveFile = UploadedFile::createFromBase($request->files->get('archive'));
@@ -416,7 +416,7 @@ class PhotoController extends Controller
{
Log::error('Bulk image upload failed.', ['error' => $archiveFile->getError(), 'reason' => $archiveFile->getErrorMessage()]);
$request->session()->flash('error', $archiveFile->getErrorMessage());
- return redirect(route('albums.show', ['id' => $album->id]));
+ return redirect(route('albums.show', ['album' => $album->id]));
}
// Create the folder to hold the analysis results if not already present
@@ -446,7 +446,7 @@ class PhotoController extends Controller
default:
$request->session()->flash('error', sprintf('The file type "%s" is not supported for bulk uploads.', $mimeType));
- return redirect(route('albums.show', ['id' => $album->id]));
+ return redirect(route('albums.show', ['album' => $album->id]));
}
$di = new \RecursiveDirectoryIterator($temporaryFolder, \RecursiveDirectoryIterator::SKIP_DOTS);
@@ -523,7 +523,7 @@ class PhotoController extends Controller
}
return redirect(route('albums.analyse', [
- 'id' => $album->id,
+ 'album' => $album->id,
'queue_token' => $queueUid
]));
}
@@ -586,7 +586,7 @@ class PhotoController extends Controller
)
);
- return redirect(route('albums.show', array('id' => $albumId, 'page' => $request->get('page', 1))));
+ return redirect(route('albums.show', array('album' => $albumId, 'page' => $request->get('page', 1))));
}
private function applyBulkActions(Request $request, Album $album)
diff --git a/resources/views/themes/base/admin/album_metadata.blade.php b/resources/views/themes/base/admin/album_metadata.blade.php
index e4ed98a..8b5990a 100644
--- a/resources/views/themes/base/admin/album_metadata.blade.php
+++ b/resources/views/themes/base/admin/album_metadata.blade.php
@@ -5,7 +5,7 @@
@lang('navigation.breadcrumb.admin')
@lang('navigation.breadcrumb.albums')
- {{ $album->name }}
+ {{ $album->name }}
@lang('navigation.breadcrumb.metadata_upgrade')
@endsection
@@ -52,7 +52,7 @@
@lang('admin.metadata_upgrade.warning')
@@ -97,7 +97,7 @@
app.analyseImage(new AnalyseImageViewModel({
'id': '{{ $photo->id }}',
'name': '{!! addslashes($photo->name) !!}',
- 'url': '{{ route('photos.re-analyse', ['id' => $photo->id, 'queue_token' => $queue_token]) }}'
+ 'url': '{{ route('photos.re-analyse', ['photo' => $photo->id, 'queue_token' => $queue_token]) }}'
}));
@endforeach
});
diff --git a/resources/views/themes/base/admin/analyse_album.blade.php b/resources/views/themes/base/admin/analyse_album.blade.php
index 5517c77..9c288c7 100644
--- a/resources/views/themes/base/admin/analyse_album.blade.php
+++ b/resources/views/themes/base/admin/analyse_album.blade.php
@@ -50,7 +50,7 @@
@@ -69,7 +69,7 @@
app.analyseImage(new AnalyseImageViewModel({
'id': '{{ $photo->id }}',
'name': '{!! addslashes($photo->name) !!}',
- 'url': '{{ route('photos.analyse', ['id' => $photo->id, 'queue_token' => $queue_token]) }}'
+ 'url': '{{ route('photos.analyse', ['photo' => $photo->id, 'queue_token' => $queue_token]) }}'
}));
@endforeach
diff --git a/resources/views/themes/base/admin/delete_album.blade.php b/resources/views/themes/base/admin/delete_album.blade.php
index 2ace94f..5cc3225 100644
--- a/resources/views/themes/base/admin/delete_album.blade.php
+++ b/resources/views/themes/base/admin/delete_album.blade.php
@@ -23,7 +23,7 @@
diff --git a/resources/views/themes/base/admin/edit_album.blade.php b/resources/views/themes/base/admin/edit_album.blade.php
index e76df64..85c3c57 100644
--- a/resources/views/themes/base/admin/edit_album.blade.php
+++ b/resources/views/themes/base/admin/edit_album.blade.php
@@ -75,7 +75,7 @@
diff --git a/resources/views/themes/base/admin/list_comments.blade.php b/resources/views/themes/base/admin/list_comments.blade.php
index d301b4e..b2812ca 100644
--- a/resources/views/themes/base/admin/list_comments.blade.php
+++ b/resources/views/themes/base/admin/list_comments.blade.php
@@ -45,7 +45,7 @@
- {{-- TODO: edit comments {{ $comment->name }} --}}
+ {{-- TODO: edit comments {{ $comment->name }} --}}
{{ $comment->name }}
@@ -67,16 +67,16 @@
|
diff --git a/resources/views/themes/base/admin/list_groups.blade.php b/resources/views/themes/base/admin/list_groups.blade.php
index 2a2b7ab..bd0aaca 100644
--- a/resources/views/themes/base/admin/list_groups.blade.php
+++ b/resources/views/themes/base/admin/list_groups.blade.php
@@ -30,11 +30,11 @@
@foreach ($groups as $group)
- {{ $group->name }}
+ {{ $group->name }}
{{ trans_choice('admin.group_number_users', $group->users()->count()) }}
|
- @lang('forms.delete_action')
+ @lang('forms.delete_action')
|
@endforeach
diff --git a/resources/views/themes/base/admin/list_storage.blade.php b/resources/views/themes/base/admin/list_storage.blade.php
index a245110..036de62 100644
--- a/resources/views/themes/base/admin/list_storage.blade.php
+++ b/resources/views/themes/base/admin/list_storage.blade.php
@@ -32,7 +32,7 @@
- {{ $storage->name }}
+ {{ $storage->name }}
@if ($storage->is_default) @endif
@if (!$storage->is_active) @endif
@@ -45,7 +45,7 @@
|
@if (!$storage->is_internal)
- @lang('forms.delete_action')
+ @lang('forms.delete_action')
@endif
|
diff --git a/resources/views/themes/base/admin/list_users.blade.php b/resources/views/themes/base/admin/list_users.blade.php
index e95ab14..eddbdf6 100644
--- a/resources/views/themes/base/admin/list_users.blade.php
+++ b/resources/views/themes/base/admin/list_users.blade.php
@@ -21,7 +21,7 @@
@foreach ($users as $user)
- {{ $user->name }}@if ($user->is_admin) @endif
+ {{ $user->name }}@if ($user->is_admin) @endif
{{ $user->email }}
|
@@ -30,7 +30,7 @@
@endif
|
- @lang('forms.delete_action')
+ @lang('forms.delete_action')
|
@endforeach
diff --git a/resources/views/themes/base/admin/show_album.blade.php b/resources/views/themes/base/admin/show_album.blade.php
index 8da50ad..20c2145 100644
--- a/resources/views/themes/base/admin/show_album.blade.php
+++ b/resources/views/themes/base/admin/show_album.blade.php
@@ -9,7 +9,7 @@
@if ($parentAlbum->id == $album->id)
{{ $album->name }}
@else
- {{ $parentAlbum->name }}
+ {{ $parentAlbum->name }}
@endif
@endforeach
@endsection
@@ -97,12 +97,12 @@
language.upload_status = '{!! addslashes(trans('admin.upload_file_status_progress')) !!}';
var urls = [];
- urls.analyse = '{{ route('albums.analyse', ['id' => $album->id, 'queue_token' => $queue_token]) }}';
- urls.delete_photo = '{{ route('photos.destroy', ['id' => 0]) }}';
- urls.flip_photo = '{{ route('photos.flip', ['id' => 0, 'horizontal' => -1, 'vertical' => -2]) }}';
- urls.move_photo = '{{ route('photos.move', ['photoId' => 0]) }}';
- urls.regenerate_thumbnails = '{{ route('photos.regenerateThumbnails', ['photoId' => 0]) }}';
- urls.rotate_photo = '{{ route('photos.rotate', ['id' => 0, 'angle' => 1]) }}';
+ urls.analyse = '{{ route('albums.analyse', ['album' => $album->id, 'queue_token' => $queue_token]) }}';
+ urls.delete_photo = '{{ route('photos.destroy', ['photo' => 0]) }}';
+ urls.flip_photo = '{{ route('photos.flip', ['photo' => 0, 'horizontal' => -1, 'vertical' => -2]) }}';
+ urls.move_photo = '{{ route('photos.move', ['photo' => 0]) }}';
+ urls.regenerate_thumbnails = '{{ route('photos.regenerateThumbnails', ['photo' => 0]) }}';
+ urls.rotate_photo = '{{ route('photos.rotate', ['photo' => 0, 'angle' => 1]) }}';
var viewModel = new UploadPhotosViewModel('{{ $album->id }}', '{{ $queue_token }}', language, urls);
var editViewModel = new EditPhotosViewModel('{{ $album->id }}', language, urls);
diff --git a/resources/views/themes/base/gallery/album_default.blade.php b/resources/views/themes/base/gallery/album_default.blade.php
index 98f5a3b..24012d9 100644
--- a/resources/views/themes/base/gallery/album_default.blade.php
+++ b/resources/views/themes/base/gallery/album_default.blade.php
@@ -13,7 +13,7 @@
@can('edit', $album)
@endcan
diff --git a/resources/views/themes/base/gallery/album_empty.blade.php b/resources/views/themes/base/gallery/album_empty.blade.php
index 6197a25..d0229a0 100644
--- a/resources/views/themes/base/gallery/album_empty.blade.php
+++ b/resources/views/themes/base/gallery/album_empty.blade.php
@@ -12,7 +12,7 @@
diff --git a/resources/views/themes/base/gallery/album_slideshow.blade.php b/resources/views/themes/base/gallery/album_slideshow.blade.php
index 70f2279..acbf16d 100644
--- a/resources/views/themes/base/gallery/album_slideshow.blade.php
+++ b/resources/views/themes/base/gallery/album_slideshow.blade.php
@@ -13,7 +13,7 @@
@can('edit', $album)
@endcan
diff --git a/resources/views/themes/base/gallery/index.blade.php b/resources/views/themes/base/gallery/index.blade.php
index f0cd704..6108677 100644
--- a/resources/views/themes/base/gallery/index.blade.php
+++ b/resources/views/themes/base/gallery/index.blade.php
@@ -16,7 +16,7 @@
{!! nl2br(e($album->description)) !!}
@can('edit', $album)
-
@lang('gallery.manage_album_link')
+
@lang('gallery.manage_album_link')
@endcan
diff --git a/resources/views/themes/base/partials/metadata_single_album_admin.blade.php b/resources/views/themes/base/partials/metadata_single_album_admin.blade.php
index f9dc511..bc8eccc 100644
--- a/resources/views/themes/base/partials/metadata_single_album_admin.blade.php
+++ b/resources/views/themes/base/partials/metadata_single_album_admin.blade.php
@@ -4,7 +4,7 @@
@can('edit', $album)
- {{ $album->name }}
+ {{ $album->name }}
@endcan
@cannot('edit', $album)
{{ $album->name }}
@@ -27,7 +27,7 @@
|
|
diff --git a/resources/views/themes/base/partials/single_album_admin.blade.php b/resources/views/themes/base/partials/single_album_admin.blade.php
index 56a946d..6c98185 100644
--- a/resources/views/themes/base/partials/single_album_admin.blade.php
+++ b/resources/views/themes/base/partials/single_album_admin.blade.php
@@ -7,7 +7,7 @@
@can('edit', $album)
- {{ $album->name }}
+ {{ $album->name }}
@endcan
@cannot('edit', $album)
{{ $album->name }}
@@ -24,10 +24,10 @@
|
|
diff --git a/routes/web.php b/routes/web.php
index 39d713a..ccfc726 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -30,51 +30,51 @@ Route::group(['prefix' => 'admin'], function () {
Route::get('albums/default-permissions', 'Admin\AlbumController@defaultPermissions')->name('albums.defaultPermissions');
Route::post('albums/set-default-group-permissions', 'Admin\AlbumController@setDefaultGroupPermissions')->name('albums.set_default_group_permissions');
Route::post('albums/set-default-user-permissions', 'Admin\AlbumController@setDefaultUserPermissions')->name('albums.set_default_user_permissions');
- Route::get('albums/{id}/analyse/{queue_token}', 'Admin\AlbumController@analyse')->name('albums.analyse');
- Route::get('albums/{id}/delete', 'Admin\AlbumController@delete')->name('albums.delete');
- Route::get('/albums/{id}/metadata', 'Admin\AlbumController@metadata')->name('albums.metadata');
- Route::post('albums/{id}/set-group-permissions', 'Admin\AlbumController@setGroupPermissions')->name('albums.set_group_permissions');
- Route::post('albums/{id}/set-user-permissions', 'Admin\AlbumController@setUserPermissions')->name('albums.set_user_permissions');
- Route::delete('albums/{id}/delete-redirect/{redirectId}', 'Admin\AlbumController@deleteRedirect')->name('albums.delete_redirect');
- Route::post('albums/{id}/store-redirect', 'Admin\AlbumController@storeRedirect')->name('albums.store_redirect');
+ Route::get('albums/{album}/analyse/{queue_token}', 'Admin\AlbumController@analyse')->name('albums.analyse');
+ Route::get('albums/{album}/delete', 'Admin\AlbumController@delete')->name('albums.delete');
+ Route::get('/albums/{album}/metadata', 'Admin\AlbumController@metadata')->name('albums.metadata');
+ Route::post('albums/{album}/set-group-permissions', 'Admin\AlbumController@setGroupPermissions')->name('albums.set_group_permissions');
+ Route::post('albums/{album}/set-user-permissions', 'Admin\AlbumController@setUserPermissions')->name('albums.set_user_permissions');
+ Route::delete('albums/{album}/delete-redirect/{redirectId}', 'Admin\AlbumController@deleteRedirect')->name('albums.delete_redirect');
+ Route::post('albums/{album}/store-redirect', 'Admin\AlbumController@storeRedirect')->name('albums.store_redirect');
Route::resource('albums', 'Admin\AlbumController');
// Photo management
- Route::post('photos/analyse/{id}/{queue_token}', 'Admin\PhotoController@analyse')->name('photos.analyse');
- Route::post('photos/flip/{photoId}/{horizontal}/{vertical}', 'Admin\PhotoController@flip')->name('photos.flip');
- Route::post('photos/move/{photoId}', 'Admin\PhotoController@move')->name('photos.move');
- Route::post('photos/reanalyse/{id}/{queue_token}', 'Admin\PhotoController@reAnalyse')->name('photos.re-analyse');
- Route::post('photos/regenerate-thumbnails/{photoId}', 'Admin\PhotoController@regenerateThumbnails')->name('photos.regenerateThumbnails');
- Route::post('photos/rotate/{photoId}/{angle}', 'Admin\PhotoController@rotate')->name('photos.rotate');
+ Route::post('photos/analyse/{photo}/{queue_token}', 'Admin\PhotoController@analyse')->name('photos.analyse');
+ Route::post('photos/flip/{photo}/{horizontal}/{vertical}', 'Admin\PhotoController@flip')->name('photos.flip');
+ Route::post('photos/move/{photo}', 'Admin\PhotoController@move')->name('photos.move');
+ Route::post('photos/reanalyse/{photo}/{queue_token}', 'Admin\PhotoController@reAnalyse')->name('photos.re-analyse');
+ Route::post('photos/regenerate-thumbnails/{photo}', 'Admin\PhotoController@regenerateThumbnails')->name('photos.regenerateThumbnails');
+ Route::post('photos/rotate/{photo}/{angle}', 'Admin\PhotoController@rotate')->name('photos.rotate');
Route::post('photos/store-bulk', 'Admin\PhotoController@storeBulk')->name('photos.storeBulk');
- Route::put('photos/update-bulk/{albumId}', 'Admin\PhotoController@updateBulk')->name('photos.updateBulk');
+ Route::put('photos/update-bulk/{photo}', 'Admin\PhotoController@updateBulk')->name('photos.updateBulk');
Route::resource('photos', 'Admin\PhotoController');
// Label management
- Route::get('labels/{id}/delete', 'Admin\LabelController@delete')->name('labels.delete');
+ Route::get('labels/{label}/delete', 'Admin\LabelController@delete')->name('labels.delete');
Route::resource('labels', 'Admin\LabelController');
// Storage management
- Route::get('storage/{id}/delete', 'Admin\StorageController@delete')->name('storage.delete');
+ Route::get('storage/{storage}/delete', 'Admin\StorageController@delete')->name('storage.delete');
Route::resource('storage', 'Admin\StorageController');
// User management
- Route::get('users/{id}/delete', 'Admin\UserController@delete')->name('users.delete');
+ Route::get('users/{user}/delete', 'Admin\UserController@delete')->name('users.delete');
Route::get('users.json', 'Admin\UserController@searchJson')->name('users.searchJson');
Route::resource('users', 'Admin\UserController');
// Group management
- Route::get('groups/{id}/delete', 'Admin\GroupController@delete')->name('groups.delete');
+ Route::get('groups/{group}/delete', 'Admin\GroupController@delete')->name('groups.delete');
Route::resource('groups', 'Admin\GroupController');
// Comments management
- Route::get('comments/{id}/approve', 'Admin\PhotoCommentController@approve')->name('comments.approve');
- Route::post('comments/{id}/approve', 'Admin\PhotoCommentController@confirmApprove')->name('comments.confirmApprove');
+ Route::get('comments/{comment}/approve', 'Admin\PhotoCommentController@approve')->name('comments.approve');
+ Route::post('comments/{comment}/approve', 'Admin\PhotoCommentController@confirmApprove')->name('comments.confirmApprove');
- Route::get('comments/{id}/reject', 'Admin\PhotoCommentController@reject')->name('comments.reject');
- Route::post('comments/{id}/reject', 'Admin\PhotoCommentController@confirmReject')->name('comments.confirmReject');
+ Route::get('comments/{comment}/reject', 'Admin\PhotoCommentController@reject')->name('comments.reject');
+ Route::post('comments/{comment}/reject', 'Admin\PhotoCommentController@confirmReject')->name('comments.confirmReject');
- Route::get('comments/{id}/delete', 'Admin\PhotoCommentController@delete')->name('comments.delete');
+ Route::get('comments/{comment}/delete', 'Admin\PhotoCommentController@delete')->name('comments.delete');
Route::post('comments/apply-bulk-action', 'Admin\PhotoCommentController@applyBulkAction')->name('comments.applyBulkAction');
Route::post('comments/bulk-action', 'Admin\PhotoCommentController@bulkAction')->name('comments.bulkAction');