Skip to content

Commit

Permalink
Fix icons for bundled perms in sharing details
Browse files Browse the repository at this point in the history
It appears `NcCheckboxRadioSwitch` does not take icons via
`<template #icon>` (at least not anymore) but two options in the bundled
 perms still used that and that has been fixed in this commit.

Signed-off-by: fenn-cs <fenn25.fn@gmail.com>
  • Loading branch information
nfebe authored and Jerome-Herbinet committed Nov 27, 2023
1 parent 41ffe3a commit 6723b5a
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 18 deletions.
15 changes: 5 additions & 10 deletions apps/files_sharing/src/views/SharingDetailsTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,12 @@
type="radio"
button-variant-grouped="vertical"
@update:checked="toggleCustomPermissions">
<EditIcon :size="20" />
<template v-if="allowsFileDrop">
{{ t('files_sharing', 'Allow upload and editing') }}
<span>{{ t('files_sharing', 'Allow upload and editing') }}</span>
</template>
<template v-else>
{{ t('files_sharing', 'Allow editing') }}
</template>

<template #icon>
<EditIcon :size="20" />
<span>{{ t('files_sharing', 'Allow editing') }}</span>
</template>
</NcCheckboxRadioSwitch>
<NcCheckboxRadioSwitch v-if="allowsFileDrop"
Expand All @@ -64,11 +61,9 @@
type="radio"
button-variant-grouped="vertical"
@update:checked="expandCustomPermissions">
{{ t('files_sharing', 'Custom permissions') }}
<DotsHorizontalIcon :size="20" />
<span>{{ t('files_sharing', 'Custom permissions') }}</span>
<small>{{ customPermissionsList }}</small>
<template #icon>
<DotsHorizontalIcon :size="20" />
</template>
</NcCheckboxRadioSwitch>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion core/css/server.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/css/server.css.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/core-common.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-common.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/files-main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files-main.js.map

Large diffs are not rendered by default.

0 comments on commit 6723b5a

Please sign in to comment.