wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix user displayName not being shown after add, added class for improved styling, fix strong for groups when english is not being used

Browse source
This commit is contained in:
Ramiro Aparicio 2013-10-21 15:31:31 +02:00
parent dfe38d13e2
commit 85edbb08c1
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/ajax/share.php
View file

@ -305,8 +305,9 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
&& $uid != OC_User::getUser()) {
$shareWith[] = array(
'label' => $displayName,
'value' => array('shareType' => OCP\Share::SHARE_TYPE_USER,
'shareWith' => $uid)
'value' => array(
'shareType' => OCP\Share::SHARE_TYPE_USER,
'shareWith' => $uid)
);
$count++;
}
@ -324,7 +325,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
|| !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])
|| !in_array($group, $_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])) {
$shareWith[] = array(
'label' => $group.' ('.$l->t('group').')',
'label' => $group,
'value' => array(
'shareType' => OCP\Share::SHARE_TYPE_GROUP,
'shareWith' => $group

12
core/js/share.js
View file

@ -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 = $( "<a>" ).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('<strong>');
var insert = $( "<a>" );
var text = (item.value.shareType == 1)? item.label + ' ('+t('core', 'group')+')' : item.label;
insert.text( text );
if(item.value.shareType == 1) {
insert = insert.wrapInner('<strong></strong>');
}
return $( "<li>" )
.addClass((item.value.shareType == 1)?'group':'user')
.append( insert )
.appendTo( ul );
};