diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2012-01-04 22:36:34 +0100 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2012-01-09 20:38:06 +0100 |
| commit | 604ca61d78881e3a1a0a41e4b50ef4cb7c1eeaf0 (patch) | |
| tree | fa046ae0be9a358f9b1abe2091779241d5942d7b /apps | |
| parent | 47548fb8c612b5a61b00b03b525fd168fe940451 (diff) | |
| download | nextcloud-server-604ca61d78881e3a1a0a41e4b50ef4cb7c1eeaf0.tar.gz nextcloud-server-604ca61d78881e3a1a0a41e4b50ef4cb7c1eeaf0.zip | |
Some cleanup, better error messages and such.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/contacts/index.php | 7 | ||||
| -rw-r--r-- | apps/contacts/js/interface.js | 26 |
2 files changed, 30 insertions, 3 deletions
diff --git a/apps/contacts/index.php b/apps/contacts/index.php index b7c88236a80..0b705e71b5d 100644 --- a/apps/contacts/index.php +++ b/apps/contacts/index.php @@ -48,9 +48,10 @@ $details = array(); if(is_null($id) && count($contacts) > 0) { $id = $contacts[0]['id']; } -$vcard = OC_Contacts_App::getContactVCard($id); -$details = OC_Contacts_VCard::structureContact($vcard); - +if(!is_null($id)) { + $vcard = OC_Contacts_App::getContactVCard($id); + $details = OC_Contacts_VCard::structureContact($vcard); +} // if( !is_null($id)/* || count($contacts)*/){ // if(is_null($id)) $id = $contacts[0]['id']; // $vcard = OC_Contacts_App::getContactVCard($id); diff --git a/apps/contacts/js/interface.js b/apps/contacts/js/interface.js index 35639ef6cc7..b9f75bdf71a 100644 --- a/apps/contacts/js/interface.js +++ b/apps/contacts/js/interface.js @@ -1,3 +1,29 @@ +/** + * ownCloud - Addressbook + * + * @author Jakob Sack + * @copyright 2011 Jakob Sack mail@jakobsack.de + * @copyright 2011-2012 Thomas Tanghus <thomas@tanghus.net> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * + * You should have received a copy of the GNU Affero General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + * + * TODO: + * If you add a contact, its thumbnail doesnt show in the list. But when you add another one it shows up, but not for the second contact added. + * Place a new contact in correct alphabetic order + */ + + Contacts={ UI:{ showCardDAVUrl:function(username, bookname){ |