diff --git a/database/migrations/2023_06_25_181952_remove_bookshelf_create_entity_permissions.php b/database/migrations/2023_06_25_181952_remove_bookshelf_create_entity_permissions.php index efb65972b..b5dcaee75 100644 --- a/database/migrations/2023_06_25_181952_remove_bookshelf_create_entity_permissions.php +++ b/database/migrations/2023_06_25_181952_remove_bookshelf_create_entity_permissions.php @@ -12,9 +12,10 @@ return new class extends Migration */ public function up() { - DB::table('entity_permissions') - ->where('entity_type', '=', 'bookshelf') - ->update(['create' => 0]); + // Note: v23.06.2 + // Migration removed since change to remove bookshelf create permissions was reverted. + // Create permissions were removed as incorrectly thought to be unused, but they did + // have a use via shelf permission copy-down to books. } /** diff --git a/lang/en/entities.php b/lang/en/entities.php index 8cd7e925f..4fb043aa9 100644 --- a/lang/en/entities.php +++ b/lang/en/entities.php @@ -106,6 +106,7 @@ return [ 'shelves_permissions_updated' => 'Shelf Permissions Updated', 'shelves_permissions_active' => 'Shelf Permissions Active', 'shelves_permissions_cascade_warning' => 'Permissions on shelves do not automatically cascade to contained books. This is because a book can exist on multiple shelves. Permissions can however be copied down to child books using the option found below.', + 'shelves_permissions_create' => 'Shelf create permissions are only used for copying permissions to child books using the action below. They do not control the ability to create books.', 'shelves_copy_permissions_to_books' => 'Copy Permissions to Books', 'shelves_copy_permissions' => 'Copy Permissions', 'shelves_copy_permissions_explain' => 'This will apply the current permission settings of this shelf to all books contained within. Before activating, ensure any changes to the permissions of this shelf have been saved.', diff --git a/resources/views/form/entity-permissions-row.blade.php b/resources/views/form/entity-permissions-row.blade.php index 5c2e86741..a47027d79 100644 --- a/resources/views/form/entity-permissions-row.blade.php +++ b/resources/views/form/entity-permissions-row.blade.php @@ -44,11 +44,11 @@ $inheriting - Boolean if the current row should be marked as inheriting default 'disabled' => $inheriting ]) - @if($entityType !== 'page' && $entityType !== 'bookshelf') + @if($entityType !== 'page')
+ * {{ trans('entities.shelves_permissions_create') }} +
+ @endif +