diff --git a/app/Http/Controllers/Admin/DefaultController.php b/app/Http/Controllers/Admin/DefaultController.php index 0f0fc6c..ae0cd02 100644 --- a/app/Http/Controllers/Admin/DefaultController.php +++ b/app/Http/Controllers/Admin/DefaultController.php @@ -96,7 +96,7 @@ class DefaultController extends Controller } $config->value = $request->request->get($key); - if (in_array($key, $passwordKeys)) + if (in_array($key, $passwordKeys) && strlen($config->value) > 0) { $config->value = encrypt($config->value); } diff --git a/app/Http/Controllers/Admin/PhotoController.php b/app/Http/Controllers/Admin/PhotoController.php index aba26c6..a2cf3b4 100644 --- a/app/Http/Controllers/Admin/PhotoController.php +++ b/app/Http/Controllers/Admin/PhotoController.php @@ -9,6 +9,7 @@ use App\Facade\Theme; use App\Helpers\FileHelper; use App\Helpers\ImageHelper; use App\Helpers\MiscHelper; +use App\Http\Requests\UpdatePhotosBulkRequest; use App\Photo; use App\Services\PhotoService; use App\Upload; @@ -395,7 +396,7 @@ class PhotoController extends Controller // } - public function updateBulk(Request $request, $albumId) + public function updateBulk(UpdatePhotosBulkRequest $request, $albumId) { $this->authorize('admin-access'); diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index dd4cb1e..55ccb52 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -115,5 +115,6 @@ return [ // Added by Andy H. for custom validators 'dir_empty' => 'The path must be an empty folder.', 'is_dir' => 'The folder must be a valid directory.', - 'is_writeable' => 'Unable to write to this folder - please check permissions.' + 'is_writeable' => 'Unable to write to this folder - please check permissions.', + 'photo_name_required' => 'The name field is required.' ]; diff --git a/resources/views/themes/base/admin/create_album.blade.php b/resources/views/themes/base/admin/create_album.blade.php index 24806e1..dd9aed6 100644 --- a/resources/views/themes/base/admin/create_album.blade.php +++ b/resources/views/themes/base/admin/create_album.blade.php @@ -23,20 +23,16 @@
@lang('admin.create_album_intro2')
@lang('admin.create_user_intro')
@lang('admin.edit_album_intro2', ['album_name' => $album->name])
@lang('admin.edit_user_intro')
@lang('admin.album_basic_info_intro')
-