summaryrefslogtreecommitdiffstats
path: root/core/js/share.js
diff options
context:
space:
mode:
authorMorris Jobke <morris.jobke@gmail.com>2013-10-18 05:46:05 -0700
committerMorris Jobke <morris.jobke@gmail.com>2013-10-18 05:46:05 -0700
commitb201e87af63d212bfd7540d0000b29322a268012 (patch)
treea6a9cc0983616db2b882dd0a69fd150c950d3607 /core/js/share.js
parent7297c6a5efcdb168768546b5e2757018713923c9 (diff)
parent8ac518bb3e0cf51bdf6c3dcf2554cc72c2f398c9 (diff)
downloadnextcloud-server-b201e87af63d212bfd7540d0000b29322a268012.tar.gz
nextcloud-server-b201e87af63d212bfd7540d0000b29322a268012.zip
Merge pull request #5338 from frisco82/fixGroupDisplay
Show (group) after groups in share dropdown
Diffstat (limited to 'core/js/share.js')
-rw-r--r--core/js/share.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/js/share.js b/core/js/share.js
index 25126d3c230..6ec15f01c1e 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -293,7 +293,7 @@ OC.Share={
// Default permissions are Edit (CRUD) and Share
var permissions = OC.PERMISSION_ALL;
OC.Share.share(itemType, itemSource, shareType, shareWith, permissions, function() {
- OC.Share.addShareWith(shareType, shareWith, selected.item.label, permissions, possiblePermissions);
+ OC.Share.addShareWith(shareType, shareWith, selected.item.value.shareWith, permissions, possiblePermissions);
$('#shareWith').val('');
OC.Share.updateIcon(itemType, itemSource);
});
@@ -334,6 +334,9 @@ OC.Share={
});
},
addShareWith:function(shareType, shareWith, shareWithDisplayName, permissions, possiblePermissions, mailSend, collection) {
+ if (shareType === 1) {
+ shareWithDisplayName = shareWithDisplayName + " (" + t('core', 'group') + ')';
+ }
if (!OC.Share.itemShares[shareType]) {
OC.Share.itemShares[shareType] = [];
}