From e906138d8da5908917fb523cb3e3484372cea16b Mon Sep 17 00:00:00 2001 From: Julius Härtl Date: Thu, 3 Dec 2020 16:02:47 +0100 Subject: Let sharees endpoint properly handle deck shares MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- apps/files_sharing/src/components/SharingInput.vue | 1 + apps/files_sharing/src/index.js | 1 + apps/files_sharing/src/mixins/ShareTypes.js | 1 + 3 files changed, 3 insertions(+) (limited to 'apps/files_sharing/src') diff --git a/apps/files_sharing/src/components/SharingInput.vue b/apps/files_sharing/src/components/SharingInput.vue index 588ed634166..5326eaf01d3 100644 --- a/apps/files_sharing/src/components/SharingInput.vue +++ b/apps/files_sharing/src/components/SharingInput.vue @@ -186,6 +186,7 @@ export default { this.SHARE_TYPES.SHARE_TYPE_CIRCLE, this.SHARE_TYPES.SHARE_TYPE_ROOM, this.SHARE_TYPES.SHARE_TYPE_GUEST, + this.SHARE_TYPES.SHARE_TYPE_DECK, ] if (OC.getCapabilities().files_sharing.public.enabled === true) { diff --git a/apps/files_sharing/src/index.js b/apps/files_sharing/src/index.js index 786b648aea1..3c0d0e65c8f 100644 --- a/apps/files_sharing/src/index.js +++ b/apps/files_sharing/src/index.js @@ -32,5 +32,6 @@ Object.assign(OC, { SHARE_TYPE_GUEST: 8, SHARE_TYPE_REMOTE_GROUP: 9, SHARE_TYPE_ROOM: 10, + SHARE_TYPE_DECK: 12, }, }) diff --git a/apps/files_sharing/src/mixins/ShareTypes.js b/apps/files_sharing/src/mixins/ShareTypes.js index b84dbf96d98..6e9524ce952 100644 --- a/apps/files_sharing/src/mixins/ShareTypes.js +++ b/apps/files_sharing/src/mixins/ShareTypes.js @@ -31,6 +31,7 @@ export default { SHARE_TYPE_REMOTE: OC.Share.SHARE_TYPE_REMOTE, SHARE_TYPE_CIRCLE: OC.Share.SHARE_TYPE_CIRCLE, SHARE_TYPE_GUEST: OC.Share.SHARE_TYPE_GUEST, + SHARE_TYPE_DECK: OC.Share.SHARE_TYPE_DECK, SHARE_TYPE_REMOTE_GROUP: OC.Share.SHARE_TYPE_REMOTE_GROUP, SHARE_TYPE_ROOM: OC.Share.SHARE_TYPE_ROOM, }, -- cgit v1.2.3 From f1a54cb6aad8dcb9c98f0070ba4d74b4941aefe3 Mon Sep 17 00:00:00 2001 From: Julius Härtl Date: Tue, 8 Dec 2020 13:00:43 +0100 Subject: Add share type deck to search results MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- apps/files_sharing/src/components/SharingInput.vue | 2 ++ 1 file changed, 2 insertions(+) (limited to 'apps/files_sharing/src') diff --git a/apps/files_sharing/src/components/SharingInput.vue b/apps/files_sharing/src/components/SharingInput.vue index 5326eaf01d3..c1331146eef 100644 --- a/apps/files_sharing/src/components/SharingInput.vue +++ b/apps/files_sharing/src/components/SharingInput.vue @@ -366,6 +366,8 @@ export default { return 'icon-circle' case this.SHARE_TYPES.SHARE_TYPE_ROOM: return 'icon-room' + case this.SHARE_TYPES.SHARE_TYPE_DECK: + return 'icon-deck' default: return '' -- cgit v1.2.3 From 8131965b740377cad5c64910ea76070cbf81868a Mon Sep 17 00:00:00 2001 From: Julius Härtl Date: Tue, 8 Dec 2020 13:01:29 +0100 Subject: Allow share results to have a detailed description and share entries to have a link MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- apps/files_sharing/src/components/SharingEntry.vue | 7 +++++-- apps/files_sharing/src/components/SharingInput.vue | 2 ++ apps/files_sharing/src/models/Share.js | 11 +++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) (limited to 'apps/files_sharing/src') diff --git a/apps/files_sharing/src/components/SharingEntry.vue b/apps/files_sharing/src/components/SharingEntry.vue index 55bdbb8fdcb..407221037dc 100644 --- a/apps/files_sharing/src/components/SharingEntry.vue +++ b/apps/files_sharing/src/components/SharingEntry.vue @@ -29,13 +29,16 @@ :tooltip-message="share.type === SHARE_TYPES.SHARE_TYPE_USER ? share.shareWith : ''" :menu-position="'left'" :url="share.shareWithAvatar" /> - +