mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More modifications for using jquery.multiple_autocomplete.

This commit is contained in:
Thomas Tanghus 2012-03-12 16:44:16 +01:00
parent 2b8125f4ba
commit c55d2af6b3
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/contacts/ajax/categories/checksumfor.php
View File

@ -20,7 +20,7 @@ foreach($vcard->children as $property){
//OC_Log::write('contacts','ajax/categories/checksumfor.php: '.$property->name, OC_Log::DEBUG);
if($property->name == 'CATEGORIES') {
$checksum = md5($property->serialize());
OC_JSON::success(array('data' => array('checksum'=>$checksum)));
OC_JSON::success(array('data' => array('value'=>$property->value, 'checksum'=>$checksum)));
exit();
}
}

24
apps/contacts/js/contacts.js
View File

@ -455,11 +455,12 @@ Contacts={
},
hasCategory:function(category) {
if(this.data.CATEGORIES) {
for(var c in this.data.CATEGORIES[0]['value']) {
var categories = this.data.CATEGORIES[0]['value'].split(/,\s*/);
for(var c in categories) {
var cat = this.data.CATEGORIES[0]['value'][c];
//console.log('hasCategory: ' + cat + ' === ' + category + '?');
console.log('hasCategory: ' + cat + ' === ' + category + '?');
if(typeof cat === 'string' && (cat.toUpperCase() === category.toUpperCase())) {
//console.log('Yes');
console.log('Yes');
return true;
}
}
@ -468,25 +469,18 @@ Contacts={
},
categoriesChanged:function(categories) { // Categories added/deleted.
console.log('categoriesChanged for ' + Contacts.UI.Card.id + ' : ' + categories);
var categorylist = $('#categories_value').find('select');
categorylist.find('option').remove();
for(var category in categories) {
console.log('categoriesChanged: ' + categories[category]);
var selected = Contacts.UI.Card.hasCategory(categories[category]) ? ' selected="selected"' : '';
var item = '<option value="' + categories[category] + '"' + selected + '>' + categories[category] + '</option>';
$(item).appendTo(categorylist);
}
$('#categories_value').find('select').multiselect('refresh');
var categorylist = $('#categories_value').find('input');
$.getJSON(OC.filePath('contacts', 'ajax', 'categories/checksumfor.php'),{'id':Contacts.UI.Card.id},function(jsondata){
if(jsondata.status == 'success'){
console.log('Setting checksum: ' + jsondata.data.checksum);
console.log('Setting checksum: ' + jsondata.data.checksum + ', value: ' + jsondata.data.value);
$('#categories_value').data('checksum', jsondata.data.checksum);
categorylist.val(jsondata.data.value);
} else {
OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
}
});
},
loadCategories:function(){ // On loading contact.
/*loadCategories:function(){ // On loading contact.
var categories = $('#categories_value').find('select');
if(this.data.CATEGORIES) {
$('#categories_value').data('checksum', this.data.CATEGORIES[0]['checksum']);
@ -501,7 +495,7 @@ Contacts={
}
});
categories.multiselect('refresh');
},
},*/
editNew:function(){ // add a new contact
this.id = ''; this.fn = ''; this.fullname = ''; this.givname = ''; this.famname = ''; this.addname = ''; this.honpre = ''; this.honsuf = '';
$.getJSON(OC.filePath('contacts', 'ajax', 'newcontact.php'),{},function(jsondata){