diff --git a/app/Http/Controllers/Admin/DefaultController.php b/app/Http/Controllers/Admin/DefaultController.php index 33f2e01..ce80e5b 100644 --- a/app/Http/Controllers/Admin/DefaultController.php +++ b/app/Http/Controllers/Admin/DefaultController.php @@ -204,16 +204,19 @@ class DefaultController extends Controller return redirect($returnUrl); } - $albumViews = UserConfig::allowedAlbumViews(); - $album = new Album(); $album->storage_id = Storage::where('is_default', true)->first()->id; $album->user_id = Auth::user()->id; $album->default_view = UserConfig::get('default_album_view'); $album->name = $albumName; $album->description = ''; + $album->is_permissions_inherited = true; $album->save(); + // Rebuild the permissions cache + $helper = new PermissionsHelper(); + $helper->rebuildCache(); + $request->request->set('album_id', $album->id); } diff --git a/resources/lang/en/global.php b/resources/lang/en/global.php index 20b9fca..0f83c7b 100644 --- a/resources/lang/en/global.php +++ b/resources/lang/en/global.php @@ -14,6 +14,7 @@ return [ 'post_max_exceeded' => 'Your upload exceeded the maximum size the web server is configured to allow. Please check the value of the "post_max_size" parameter in php.ini.', 'powered_by' => 'Powered by :link_startBlue Twilight:link_end - the self-hosted PHP photo gallery software.', 'quick_upload' => [ + 'inherit_by_default' => 'A new album will inherit your gallery\'s default permissions. You can change this afterwards on the album\'s Permissions tab.', 'intro' => 'Use the quick upload feature to quickly add a new photo to an album.', 'or' => '- or -', 'title' => 'Quick Upload' diff --git a/resources/views/themes/base/partials/quick_upload.blade.php b/resources/views/themes/base/partials/quick_upload.blade.php index 8253460..ec3c8b7 100644 --- a/resources/views/themes/base/partials/quick_upload.blade.php +++ b/resources/views/themes/base/partials/quick_upload.blade.php @@ -31,6 +31,10 @@ + +
+ @lang('global.quick_upload.inherit_by_default') +