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

Load icons for addressbooks, fix statuses for types other than files

Browse source
This commit is contained in:
Michael Gapczynski 2012-08-06 15:24:08 -04:00
parent 03d65af5dc
commit 14d13a740f
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/contacts/js/settings.js
View file

@ -4,6 +4,7 @@ OC.Contacts.Settings = OC.Contacts.Settings || {
this.Addressbook.adrsettings = $('.addressbooks-settings').first();
this.Addressbook.adractions = $('#contacts-settings').find('div.actions');
console.log('actions: ' + this.Addressbook.adractions.length);
OC.Share.loadIcons('addressbook');
},
Addressbook:{
showActions:function(act) {

2
lib/public/share.php
View file

@ -506,7 +506,7 @@ class Share {
if ($itemType == 'file' || $itemType == 'folder') {
$select = '*PREFIX*share.id, item_type, *PREFIX*share.parent, share_type, *PREFIX*fscache.path as file_source';
} else {
$select = 'id, item_source, parent, share_type';
$select = 'id, item_type, item_source, parent, share_type';
}
} else {
if (isset($uidOwner)) {