summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2011-10-07 23:01:44 +0200
committerBart Visscher <bartv@thisnet.nl>2011-10-07 23:01:49 +0200
commita13d42fdaf5751afc42dff3770c6f9eb27a0a8ed (patch)
treee09aef17baba985c9de472c6f1a6643a602ab26b /apps
parent46b8703b715230122a14548a229fc648077ca0fe (diff)
downloadnextcloud-server-a13d42fdaf5751afc42dff3770c6f9eb27a0a8ed.tar.gz
nextcloud-server-a13d42fdaf5751afc42dff3770c6f9eb27a0a8ed.zip
Fixes for adding contact property
Diffstat (limited to 'apps')
-rw-r--r--apps/contacts/ajax/addproperty.php2
-rw-r--r--apps/contacts/js/interface.js2
-rw-r--r--apps/contacts/lib/vcard.php1
-rw-r--r--apps/contacts/templates/part.details.php2
4 files changed, 4 insertions, 3 deletions
diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php
index 68c4f65fa5c..101cfabbe84 100644
--- a/apps/contacts/ajax/addproperty.php
+++ b/apps/contacts/ajax/addproperty.php
@@ -53,7 +53,7 @@ $name = $_POST['name'];
$value = $_POST['value'];
$parameters = isset($_POST['parameteres'])?$_POST['parameters']:array();
-OC_Contacts_VCard::addVCardProperty($vcard, $name, $value, $parameters);
+$property = OC_Contacts_VCard::addVCardProperty($vcard, $name, $value, $parameters);
$line = count($vcard->children) - 1;
$checksum = md5($property->serialize());
diff --git a/apps/contacts/js/interface.js b/apps/contacts/js/interface.js
index 215c4001d9e..0fcfdeaab5d 100644
--- a/apps/contacts/js/interface.js
+++ b/apps/contacts/js/interface.js
@@ -75,7 +75,7 @@ $(document).ready(function(){
$('#contacts_addpropertyform input[type="submit"]').live('click',function(){
$.post('ajax/addproperty.php',$('#contacts_addpropertyform').serialize(),function(jsondata){
if(jsondata.status == 'success'){
- $('#contacts_cardoptions').before(jsondata.data.page);
+ $('#contacts_details').append(jsondata.data.page);
$('#contacts_addpropertyform').remove();
$('#contacts_addcontactsparts').remove();
}
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index bff2897384f..9f15cf4bc37 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -290,6 +290,7 @@ class OC_Contacts_VCard{
}
$vcard->add($property);
+ return $property;
}
/**
diff --git a/apps/contacts/templates/part.details.php b/apps/contacts/templates/part.details.php
index 254d54a4e8e..26a33739acb 100644
--- a/apps/contacts/templates/part.details.php
+++ b/apps/contacts/templates/part.details.php
@@ -1,5 +1,5 @@
<?php if(array_key_exists('FN',$_['details'])): ?>
- <table>
+ <table id="contacts_details">
<?php if(isset($_['details']['PHOTO'])): // Emails first ?>
<tr class="contacts_details_property">
<td class="contacts_details_left">&nbsp;</td>