From 85edbb08c1768237e005fea3a763deff2c859c29 Mon Sep 17 00:00:00 2001 From: Ramiro Aparicio Date: Mon, 21 Oct 2013 15:31:31 +0200 Subject: fix user displayName not being shown after add, added class for improved styling, fix strong for groups when english is not being used --- core/js/share.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'core/js') diff --git a/core/js/share.js b/core/js/share.js index 6ec15f01c1e..5494f6ce2e3 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.value.shareWith, permissions, possiblePermissions); + OC.Share.addShareWith(shareType, shareWith, selected.item.label, permissions, possiblePermissions); $('#shareWith').val(''); OC.Share.updateIcon(itemType, itemSource); }); @@ -302,12 +302,14 @@ OC.Share={ }) // customize internal _renderItem function to display groups and users differently .data("ui-autocomplete")._renderItem = function( ul, item ) { - var insert = $( "" ).text( item.label ); - if(item.label.length > 8 && item.label.substr(item.label.length-8) === ' (group)') { - // current label is group - wrap "strong" element - insert = insert.wrapInner(''); + var insert = $( "" ); + var text = (item.value.shareType == 1)? item.label + ' ('+t('core', 'group')+')' : item.label; + insert.text( text ); + if(item.value.shareType == 1) { + insert = insert.wrapInner(''); } return $( "
  • " ) + .addClass((item.value.shareType == 1)?'group':'user') .append( insert ) .appendTo( ul ); }; -- cgit v1.2.3