diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php index 9dbd96c5a..ea4228488 100755 --- a/resources/lang/en/settings.php +++ b/resources/lang/en/settings.php @@ -161,6 +161,7 @@ return [ 'roles_system_warning' => 'Be aware that access to any of the above three permissions can allow a user to alter their own privileges or the privileges of others in the system. Only assign roles with these permissions to trusted users.', 'role_asset_desc' => 'These permissions control default access to the assets within the system. Permissions on Books, Chapters and Pages will override these permissions.', 'role_asset_admins' => 'Admins are automatically given access to all content but these options may show or hide UI options.', + 'role_asset_image_view_note' => 'This relates to visibility within the image manager. Actual access of uploaded image files will be dependant upon system image storage option.', 'role_all' => 'All', 'role_own' => 'Own', 'role_controlled_by_asset' => 'Controlled by the asset they are uploaded to', diff --git a/resources/views/settings/roles/parts/form.blade.php b/resources/views/settings/roles/parts/form.blade.php index 73d6a03d0..593791997 100644 --- a/resources/views/settings/roles/parts/form.blade.php +++ b/resources/views/settings/roles/parts/form.blade.php @@ -172,7 +172,7 @@ {{ trans('common.toggle_all') }} @include('settings.roles.parts.checkbox', ['permission' => 'image-create-all', 'label' => '']) - {{ trans('settings.role_controlled_by_asset') }} + {{ trans('settings.role_controlled_by_asset') }}1 @include('settings.roles.parts.checkbox', ['permission' => 'image-update-own', 'label' => trans('settings.role_own')])
@@ -221,5 +221,11 @@ + +
+

+ 1 {{ trans('settings.role_asset_image_view_note') }} +

+
\ No newline at end of file diff --git a/tests/Permissions/RolesTest.php b/tests/Permissions/RolesTest.php index 3604a3cac..b992bfecc 100644 --- a/tests/Permissions/RolesTest.php +++ b/tests/Permissions/RolesTest.php @@ -163,6 +163,14 @@ class RolesTest extends TestCase $this->assertEquals($this->user->id, $roleA->users()->first()->id); } + public function test_image_view_notice_shown_on_role_form() + { + /** @var Role $role */ + $role = Role::query()->first(); + $this->asAdmin()->get("/settings/roles/{$role->id}") + ->assertSee('Actual access of uploaded image files will be dependant upon system image storage option'); + } + public function test_copy_role_button_shown() { /** @var Role $role */