diff --git a/apps/contacts/ajax/addressbook/add.php b/apps/contacts/ajax/addressbook/add.php index 617c2fd182..65077743ed 100644 --- a/apps/contacts/ajax/addressbook/add.php +++ b/apps/contacts/ajax/addressbook/add.php @@ -34,4 +34,4 @@ if(!OC_Contacts_Addressbook::setActive($bookid, 1)) { bailOut('Error activating addressbook.'); } $addressbook = OC_Contacts_App::getAddressbook($bookid); -OCP\JSON::success(array('addressbook' => $addressbook)); +OCP\JSON::success(array('data' => array('addressbook' => $addressbook))); diff --git a/apps/contacts/js/settings.js b/apps/contacts/js/settings.js index 6f0a8b8835..284f972be8 100644 --- a/apps/contacts/js/settings.js +++ b/apps/contacts/js/settings.js @@ -79,26 +79,26 @@ OC.Contacts.Settings = OC.Contacts.Settings || { if(jsondata.status == 'success'){ self.showActions(['new',]); self.adractions.removeData('id'); - active = Boolean(Number(jsondata.addressbook.active)); + active = Boolean(Number(jsondata.data.addressbook.active)); if(id == 'new') { self.adrsettings.find('table') - .append('' + .append('' + '' - + ''+jsondata.addressbook.displayname+'' - + ''+jsondata.addressbook.description+'' + + ''+jsondata.data.addressbook.displayname+'' + + ''+jsondata.data.addressbook.description+'' + '' + '' + '' + + encodeURIComponent(jsondata.data.addressbook.uri)+'?export">' + '' + '' + ''); } else { var row = self.adrsettings.find('tr[data-id="'+id+'"]'); row.find('td.active').find('input:checkbox').prop('checked', active); - row.find('td.name').text(jsondata.addressbook.displayname); - row.find('td.description').text(jsondata.addressbook.description); + row.find('td.name').text(jsondata.data.addressbook.displayname); + row.find('td.description').text(jsondata.data.addressbook.description); } OC.Contacts.Contacts.update(); } else {