webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-30 04:23:11 +03:00
Code Activity

Shelf permissions: reverted create removal

Browse Source 
Reverted work in 847a57a49a.
Left test in but updated to new expectation.
Left migration in but removed content to prevent new pre-v23.06
upgraders loosing shelf create permission status.
Added note to permission to describe use-case.

For #4375
This commit is contained in:
Dan Brown
2023-07-12 22:04:05 +01:00
parent a83150131a
commit ae834050f5
5 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/form/entity-permissions-row.blade.php
View File

@ -44,11 +44,11 @@ $inheriting - Boolean if the current row should be marked as inheriting default
'disabled' => $inheriting
])
</div>
@if($entityType !== 'page' && $entityType !== 'bookshelf')
@if($entityType !== 'page')
<div class="px-l">
@include('form.custom-checkbox', [
'name' => 'permissions[' . $role->id . '][create]',
'label' => trans('common.create'),
'label' => trans('common.create') . ($entityType === 'bookshelf' ? ' *' : ''),
'value' => 'true',
'checked' => $permission->create,
'disabled' => $inheriting

15
resources/views/form/entity-permissions.blade.php
View File

@ -70,8 +70,17 @@
<hr class="mb-m">
<div class="text-right">
<a href="{{ $model->getUrl() }}" class="button outline">{{ trans('common.cancel') }}</a>
<button type="submit" class="button">{{ trans('entities.permissions_save') }}</button>
<div class="flex-container-row justify-space-between gap-m wrap">
<div class="flex min-width-m">
@if($model instanceof \BookStack\Entities\Models\Bookshelf)
<p class="small text-muted mb-none">
* {{ trans('entities.shelves_permissions_create') }}
</p>
@endif
</div>
<div class="text-right">
<a href="{{ $model->getUrl() }}" class="button outline">{{ trans('common.cancel') }}</a>
<button type="submit" class="button">{{ trans('entities.permissions_save') }}</button>
</div>
</div>
</form>