summaryrefslogtreecommitdiffstats
path: root/core/js
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-02-13 18:25:04 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-02-13 18:25:04 +0100
commit11707dffcee6ecf1d8e2931c3cb2144e585d0eac (patch)
tree76267d8868a157e7c19c73e630cf5aad9bae2c52 /core/js
parent198d23406873aeda6fed68a80220abc08be5d8e0 (diff)
parent862e28f006801b13565f99253976fe973a09e657 (diff)
downloadnextcloud-server-11707dffcee6ecf1d8e2931c3cb2144e585d0eac.tar.gz
nextcloud-server-11707dffcee6ecf1d8e2931c3cb2144e585d0eac.zip
Merge pull request #22351 from owncloud/fix_22277
show remote server on federated share auto-complete
Diffstat (limited to 'core/js')
-rw-r--r--core/js/sharedialogview.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index ea7e198cb46..225c9bffd62 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -245,7 +245,11 @@
if (item.value.shareType === OC.Share.SHARE_TYPE_GROUP) {
text = text + ' ('+t('core', 'group')+')';
} else if (item.value.shareType === OC.Share.SHARE_TYPE_REMOTE) {
- text = text + ' ('+t('core', 'remote')+')';
+ if (item.value.server) {
+ text = text + ' (' + t('core', 'at') + ' ' + item.value.server + ')';
+ } else {
+ text = text + ' (' + t('core', 'remote') + ')';
+ }
}
insert.text(text);
if(item.value.shareType === OC.Share.SHARE_TYPE_GROUP) {