diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-06 15:24:08 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-06 15:24:08 -0400 |
| commit | 14d13a740fc1eda23f8d1b037e8eed9b4e3266a9 (patch) | |
| tree | 7f82f4f3c924537d67d6f64b1bc0698a9713b16a | |
| parent | 03d65af5dc23ffb5a00dd504d925514ecb1d80f3 (diff) | |
| download | nextcloud-server-14d13a740fc1eda23f8d1b037e8eed9b4e3266a9.tar.gz nextcloud-server-14d13a740fc1eda23f8d1b037e8eed9b4e3266a9.zip | |
Load icons for addressbooks, fix statuses for types other than files
| -rw-r--r-- | apps/contacts/js/settings.js | 1 | ||||
| -rw-r--r-- | lib/public/share.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/apps/contacts/js/settings.js b/apps/contacts/js/settings.js index 284f972be8e..ee8d889d722 100644 --- a/apps/contacts/js/settings.js +++ b/apps/contacts/js/settings.js @@ -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) { diff --git a/lib/public/share.php b/lib/public/share.php index c31f316efef..f71b5089786 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -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)) { |