diff --git a/apps/files/src/views/Sidebar.vue b/apps/files/src/views/Sidebar.vue index 9a00df1737..e99389de75 100644 --- a/apps/files/src/views/Sidebar.vue +++ b/apps/files/src/views/Sidebar.vue @@ -113,7 +113,7 @@ export default { */ davPath() { const user = OC.getCurrentUser().uid - return OC.linkToRemote(`dav/files/${user}${encodeURIComponent(this.file)}`) + return OC.linkToRemote(`dav/files/${user}${this.file}`) }, /** diff --git a/apps/files_sharing/src/components/SharingEntryLink.vue b/apps/files_sharing/src/components/SharingEntryLink.vue index afeaee06bd..4501d67cbb 100644 --- a/apps/files_sharing/src/components/SharingEntryLink.vue +++ b/apps/files_sharing/src/components/SharingEntryLink.vue @@ -247,7 +247,14 @@ @update:value="debounceQueueUpdate('note')" /> - + + + {{ name }} + {{ t('files_sharing', 'Delete share') }} diff --git a/apps/files_sharing/src/services/ExternalLinkActions.js b/apps/files_sharing/src/services/ExternalLinkActions.js index f67a1cb115..35377d8676 100644 --- a/apps/files_sharing/src/services/ExternalLinkActions.js +++ b/apps/files_sharing/src/services/ExternalLinkActions.js @@ -52,11 +52,11 @@ export default class ExternalLinkActions { * @returns {boolean} */ registerAction(action) { - if (typeof action === 'object' && action.render && action.components) { + if (typeof action === 'object' && action.icon && action.name && action.url) { this.#state.actions.push(action) return true } - console.error(`Invalid action component provided`, action) + console.error(`Invalid action provided`, action) return false } diff --git a/apps/files_sharing/src/views/SharingTab.vue b/apps/files_sharing/src/views/SharingTab.vue index 4f16f4b243..216b2e74ff 100644 --- a/apps/files_sharing/src/views/SharingTab.vue +++ b/apps/files_sharing/src/views/SharingTab.vue @@ -69,6 +69,14 @@ :id="`${fileInfo.id}`" type="file" :name="fileInfo.name" /> + + +
+ +
diff --git a/apps/systemtags/src/systemtagsinfoview.js b/apps/systemtags/src/systemtagsinfoview.js index 548a147591..2ec1ba0fef 100644 --- a/apps/systemtags/src/systemtagsinfoview.js +++ b/apps/systemtags/src/systemtagsinfoview.js @@ -30,7 +30,7 @@ _rendered: false, - className: 'systemTagsInfoView hidden', + className: 'systemTagsInfoView', /** * @type OC.SystemTags.SystemTagsInputField @@ -123,11 +123,7 @@ var appliedTags = collection.map(modelToSelection) self._inputView.setData(appliedTags) - if (appliedTags.length !== 0) { - self.show() - } else { - self.hide() - } + self.show() } }) } diff --git a/core/css/systemtags.scss b/core/css/systemtags.scss index bffafe101e..e2b587fcc7 100644 --- a/core/css/systemtags.scss +++ b/core/css/systemtags.scss @@ -69,8 +69,10 @@ } } +.systemTagsInfoView, .systemtags-select2-container { width: 100%; + .select2-choices .select2-search-choice.select2-locked .label { opacity: 0.5; }