diff options
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/l10n/tr.js | 2 | ||||
| -rw-r--r-- | apps/files_sharing/l10n/tr.json | 2 | ||||
| -rw-r--r-- | apps/files_sharing/src/views/SharingTab.vue | 25 |
3 files changed, 25 insertions, 4 deletions
diff --git a/apps/files_sharing/l10n/tr.js b/apps/files_sharing/l10n/tr.js index 012b1b8fb5c..f1b539894f0 100644 --- a/apps/files_sharing/l10n/tr.js +++ b/apps/files_sharing/l10n/tr.js @@ -185,6 +185,8 @@ OC.L10N.register( "Set default folder for accepted shares" : "Onaylanmış paylaşımların varsayılan klasörünü ayarlayın", "Reset" : "Sıfırla", "Reset folder to system default" : "Sistem varsayılan klasörüne sıfırlar", + "Share expiration: " : "Paylaşım geçerlilik sonu:", + "Share Expiration" : "Paylaşım geçerlilik sonu", "group" : "grup", "conversation" : "görüşme", "remote" : "uzak", diff --git a/apps/files_sharing/l10n/tr.json b/apps/files_sharing/l10n/tr.json index 6bf73ea925e..b6cc4a1a088 100644 --- a/apps/files_sharing/l10n/tr.json +++ b/apps/files_sharing/l10n/tr.json @@ -183,6 +183,8 @@ "Set default folder for accepted shares" : "Onaylanmış paylaşımların varsayılan klasörünü ayarlayın", "Reset" : "Sıfırla", "Reset folder to system default" : "Sistem varsayılan klasörüne sıfırlar", + "Share expiration: " : "Paylaşım geçerlilik sonu:", + "Share Expiration" : "Paylaşım geçerlilik sonu", "group" : "grup", "conversation" : "görüşme", "remote" : "uzak", diff --git a/apps/files_sharing/src/views/SharingTab.vue b/apps/files_sharing/src/views/SharingTab.vue index 9caa1a0973a..e9e068a7c1d 100644 --- a/apps/files_sharing/src/views/SharingTab.vue +++ b/apps/files_sharing/src/views/SharingTab.vue @@ -94,6 +94,11 @@ :reshare="reshare" :shares="shares" @open-sharing-details="toggleShareDetailsView" /> + <!-- Non link external shares list --> + <SharingList v-if="!loading" + :shares="externalShares" + :file-info="fileInfo" + @open-sharing-details="toggleShareDetailsView" /> <!-- link shares list --> <SharingLinkList v-if="!loading" ref="linkShareList" @@ -180,6 +185,7 @@ import SharingList from './SharingList.vue' import SharingDetailsTab from './SharingDetailsTab.vue' import ShareDetails from '../mixins/ShareDetails.js' +import logger from '../services/logger.ts' export default { name: 'SharingTab', @@ -215,6 +221,7 @@ export default { sharedWithMe: {}, shares: [], linkShares: [], + externalShares: [], sections: OCA.Sharing.ShareTabSections.getSections(), projectsEnabled: loadState('core', 'projects_enabled', false), @@ -358,11 +365,19 @@ export default { ], ) - this.linkShares = shares.filter(share => share.type === ShareType.Link || share.type === ShareType.Email) - this.shares = shares.filter(share => share.type !== ShareType.Link && share.type !== ShareType.Email) + for (const share of shares) { + if ([ShareType.Link, ShareType.Email].includes(share.type)) { + this.linkShares.push(share) + } else if ([ShareType.Remote, ShareType.RemoteGroup].includes(share.type)) { + this.externalShares.push(share) + } else { + this.shares.push(share) + } + } - console.debug('Processed', this.linkShares.length, 'link share(s)') - console.debug('Processed', this.shares.length, 'share(s)') + logger.debug(`Processed ${this.linkShares.length} link share(s)`) + logger.debug(`Processed ${this.shares.length} share(s)`) + logger.debug(`Processed ${this.externalShares.length} external share(s)`) } }, @@ -423,6 +438,8 @@ export default { // meaning: not from the ShareInput if (share.type === ShareType.Email) { this.linkShares.unshift(share) + } else if ([ShareType.Remote, ShareType.RemoteGroup].includes(share.type)) { + this.externalShares.unshift(share) } else { this.shares.unshift(share) } |