diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2020-08-14 17:03:57 +0200 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2020-08-17 21:55:29 +0200 |
| commit | 4485cb30a1bd4b86492203b20c43e0c8fdd47f71 (patch) | |
| tree | 228dc4bd2d4827f174ed6b96d514fddfe5c562d1 /apps/files_sharing/src | |
| parent | 5b26487f142843ad99a663d1ce2223c46a9498b2 (diff) | |
| download | nextcloud-server-4485cb30a1bd4b86492203b20c43e0c8fdd47f71.tar.gz nextcloud-server-4485cb30a1bd4b86492203b20c43e0c8fdd47f71.zip | |
Display user-status in sharing list
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
Diffstat (limited to 'apps/files_sharing/src')
| -rw-r--r-- | apps/files_sharing/src/components/SharingEntry.vue | 15 | ||||
| -rw-r--r-- | apps/files_sharing/src/models/Share.js | 4 | ||||
| -rw-r--r-- | apps/files_sharing/src/views/SharingTab.vue | 1 |
3 files changed, 20 insertions, 0 deletions
diff --git a/apps/files_sharing/src/components/SharingEntry.vue b/apps/files_sharing/src/components/SharingEntry.vue index f37127d3b0c..2f213730bf8 100644 --- a/apps/files_sharing/src/components/SharingEntry.vue +++ b/apps/files_sharing/src/components/SharingEntry.vue @@ -29,6 +29,10 @@ :url="share.shareWithAvatar" /> <div v-tooltip.auto="tooltip" class="sharing-entry__desc"> <h5>{{ title }}</h5> + <p v-if="hasStatus"> + <span>{{ share.status.icon || '' }}</span> + <span>{{ share.status.message || '' }}</span> + </p> </div> <Actions menu-align="right" @@ -342,6 +346,17 @@ export default { && moment().add(1 + this.config.defaultInternalExpireDate, 'days') }, + /** + * @returns {bool} + */ + hasStatus() { + if (this.share.type !== this.SHARE_TYPES.SHARE_TYPE_USER) { + return false + } + + return (typeof this.share.status === 'object' && !Array.isArray(this.share.status)) + }, + }, methods: { diff --git a/apps/files_sharing/src/models/Share.js b/apps/files_sharing/src/models/Share.js index bf1b2ec9ac3..07f74652a44 100644 --- a/apps/files_sharing/src/models/Share.js +++ b/apps/files_sharing/src/models/Share.js @@ -528,4 +528,8 @@ export default class Share { return this.#share.item_source } + get status() { + return this.#share.status + } + } diff --git a/apps/files_sharing/src/views/SharingTab.vue b/apps/files_sharing/src/views/SharingTab.vue index 445bad3795c..40c8572912f 100644 --- a/apps/files_sharing/src/views/SharingTab.vue +++ b/apps/files_sharing/src/views/SharingTab.vue @@ -286,6 +286,7 @@ export default { this.linkShares = shares.filter(share => share.type === this.SHARE_TYPES.SHARE_TYPE_LINK || share.type === this.SHARE_TYPES.SHARE_TYPE_EMAIL) this.shares = shares.filter(share => share.type !== this.SHARE_TYPES.SHARE_TYPE_LINK && share.type !== this.SHARE_TYPES.SHARE_TYPE_EMAIL) + console.debug('Processed', this.linkShares.length, 'link share(s)') console.debug('Processed', this.shares.length, 'share(s)') } |