diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2011-12-09 15:25:26 +0100 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2011-12-09 15:25:26 +0100 |
| commit | 7aa8eb3427679366905840b80a69e36344a5632d (patch) | |
| tree | 347a2100ad445620ed21b17f9faa90fe0edb3874 /apps/contacts/js | |
| parent | b3661adf028570f6158dfd5092ecb1398d5be0df (diff) | |
| parent | eeaf539a4414e3081b6f6652167363a3221a1973 (diff) | |
| download | nextcloud-server-7aa8eb3427679366905840b80a69e36344a5632d.tar.gz nextcloud-server-7aa8eb3427679366905840b80a69e36344a5632d.zip | |
Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
Conflicts:
apps/contacts/ajax/deletebook.php
apps/contacts/index.php
Diffstat (limited to 'apps/contacts/js')
| -rw-r--r-- | apps/contacts/js/interface.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/contacts/js/interface.js b/apps/contacts/js/interface.js index 8e699f52c93..2937e8a0925 100644 --- a/apps/contacts/js/interface.js +++ b/apps/contacts/js/interface.js @@ -238,7 +238,7 @@ $(document).ready(function(){ $('.contacts_property [data-use="edit"]').live('click',function(){ var id = $('#rightcontent').data('id'); - var checksum = $(this).parents('li').first().data('checksum'); + var checksum = $(this).parents('.contacts_property').first().data('checksum'); $.getJSON('ajax/showsetproperty.php',{'id': id, 'checksum': checksum },function(jsondata){ if(jsondata.status == 'success'){ $('.contacts_property[data-checksum="'+checksum+'"]').html(jsondata.data.page) |