aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files_sharing')
-rw-r--r--apps/files_sharing/l10n/de.js2
-rw-r--r--apps/files_sharing/l10n/de.json2
-rw-r--r--apps/files_sharing/l10n/de_DE.js2
-rw-r--r--apps/files_sharing/l10n/de_DE.json2
-rw-r--r--apps/files_sharing/l10n/tr.js2
-rw-r--r--apps/files_sharing/l10n/tr.json2
-rw-r--r--apps/files_sharing/l10n/uk.js2
-rw-r--r--apps/files_sharing/l10n/uk.json2
-rw-r--r--apps/files_sharing/src/views/SharingTab.vue25
9 files changed, 31 insertions, 10 deletions
diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js
index 9b260dd1af0..3a897c97c5c 100644
--- a/apps/files_sharing/l10n/de.js
+++ b/apps/files_sharing/l10n/de.js
@@ -412,7 +412,7 @@ OC.L10N.register(
"You can upload into this folder" : "Du kannst in diesen Ordner hochladen",
"No compatible server found at {remote}" : "Keinen kompatiblen Server unter {remote} gefunden",
"Invalid server URL" : "Falsche Server-URL",
- "Failed to add the public link to your Nextcloud" : "Fehler beim Hinzufügen des öffentlichen Links zu deiner Nextcloud",
+ "Failed to add the public link to your Nextcloud" : "Der öffentliche Link konnte nicht zu deiner Nextcloud hinzugefügt werden",
"Files" : "Dateien",
"Download all files" : "Alle Dateien herunterladen",
"Search for share recipients" : "Nach Freigabe-Empfängern suchen",
diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json
index 4b61000993d..4dc0f6a273b 100644
--- a/apps/files_sharing/l10n/de.json
+++ b/apps/files_sharing/l10n/de.json
@@ -410,7 +410,7 @@
"You can upload into this folder" : "Du kannst in diesen Ordner hochladen",
"No compatible server found at {remote}" : "Keinen kompatiblen Server unter {remote} gefunden",
"Invalid server URL" : "Falsche Server-URL",
- "Failed to add the public link to your Nextcloud" : "Fehler beim Hinzufügen des öffentlichen Links zu deiner Nextcloud",
+ "Failed to add the public link to your Nextcloud" : "Der öffentliche Link konnte nicht zu deiner Nextcloud hinzugefügt werden",
"Files" : "Dateien",
"Download all files" : "Alle Dateien herunterladen",
"Search for share recipients" : "Nach Freigabe-Empfängern suchen",
diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js
index 5caec03aaea..dcf87c7df98 100644
--- a/apps/files_sharing/l10n/de_DE.js
+++ b/apps/files_sharing/l10n/de_DE.js
@@ -412,7 +412,7 @@ OC.L10N.register(
"You can upload into this folder" : "Sie können in diesen Ordner hochladen",
"No compatible server found at {remote}" : "Keinen kompatiblen Server unter {remote} gefunden",
"Invalid server URL" : "Falsche Server-URL",
- "Failed to add the public link to your Nextcloud" : "Fehler beim Hinzufügen des öffentlichen Links zu Ihrer Nextcloud",
+ "Failed to add the public link to your Nextcloud" : "Der öffentliche Link konnte nicht zu Ihrer Nextcloud hinzugefügt werden",
"Files" : "Dateien",
"Download all files" : "Alle Dateien herunterladen",
"Search for share recipients" : "Nach Freigabeempfängern suchen",
diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json
index cd955c1163d..b918effcbd8 100644
--- a/apps/files_sharing/l10n/de_DE.json
+++ b/apps/files_sharing/l10n/de_DE.json
@@ -410,7 +410,7 @@
"You can upload into this folder" : "Sie können in diesen Ordner hochladen",
"No compatible server found at {remote}" : "Keinen kompatiblen Server unter {remote} gefunden",
"Invalid server URL" : "Falsche Server-URL",
- "Failed to add the public link to your Nextcloud" : "Fehler beim Hinzufügen des öffentlichen Links zu Ihrer Nextcloud",
+ "Failed to add the public link to your Nextcloud" : "Der öffentliche Link konnte nicht zu Ihrer Nextcloud hinzugefügt werden",
"Files" : "Dateien",
"Download all files" : "Alle Dateien herunterladen",
"Search for share recipients" : "Nach Freigabeempfängern suchen",
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/l10n/uk.js b/apps/files_sharing/l10n/uk.js
index c41217776a5..a87d5169bfc 100644
--- a/apps/files_sharing/l10n/uk.js
+++ b/apps/files_sharing/l10n/uk.js
@@ -411,7 +411,7 @@ OC.L10N.register(
"You can upload into this folder" : "Ви можете завантажити до цього каталогу",
"No compatible server found at {remote}" : "Відсутній сумісний сервер за адресою {remote}",
"Invalid server URL" : "Недійсна адреса сервера URL",
- "Failed to add the public link to your Nextcloud" : "Не вдалося додати загальнодоступне посилання до вашого Nextcloud",
+ "Failed to add the public link to your Nextcloud" : "Не вдалося додати публічне посилання до вашого Nextcloud",
"Files" : "Файли",
"Download all files" : "Звантажити всі файли",
"Search for share recipients" : "Виберіть отримувачів",
diff --git a/apps/files_sharing/l10n/uk.json b/apps/files_sharing/l10n/uk.json
index 5045716043d..2f199857bc3 100644
--- a/apps/files_sharing/l10n/uk.json
+++ b/apps/files_sharing/l10n/uk.json
@@ -409,7 +409,7 @@
"You can upload into this folder" : "Ви можете завантажити до цього каталогу",
"No compatible server found at {remote}" : "Відсутній сумісний сервер за адресою {remote}",
"Invalid server URL" : "Недійсна адреса сервера URL",
- "Failed to add the public link to your Nextcloud" : "Не вдалося додати загальнодоступне посилання до вашого Nextcloud",
+ "Failed to add the public link to your Nextcloud" : "Не вдалося додати публічне посилання до вашого Nextcloud",
"Files" : "Файли",
"Download all files" : "Звантажити всі файли",
"Search for share recipients" : "Виберіть отримувачів",
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)
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-29 04:09:07 +0000