Browse Source

Display user-status in sharing list

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
tags/v20.0.0beta1
Georg Ehrke 3 years ago
parent
commit
4485cb30a1
No account linked to committer's email address

+ 1
- 1
apps/files_sharing/js/dist/files_sharing_tab.js
File diff suppressed because it is too large
View File


+ 1
- 1
apps/files_sharing/js/dist/files_sharing_tab.js.map
File diff suppressed because it is too large
View File


+ 15
- 0
apps/files_sharing/src/components/SharingEntry.vue View File

@@ -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: {

+ 4
- 0
apps/files_sharing/src/models/Share.js View File

@@ -528,4 +528,8 @@ export default class Share {
return this.#share.item_source
}

get status() {
return this.#share.status
}

}

+ 1
- 0
apps/files_sharing/src/views/SharingTab.vue View File

@@ -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)')
}

Loading…
Cancel
Save