rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2025-01-29 18:52:18 +01:00
Code Issues Releases Activity

Cleanup add to/remove from groups.

Browse Source
This commit is contained in:
Thomas Tanghus 2012-11-05 12:39:49 +01:00
parent c76abd593a
commit 1588a6504d
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/app.js
View File

@ -633,7 +633,7 @@ OC.Contacts = OC.Contacts || {
$(rmopts).appendTo(this.$groups) $(rmopts).appendTo(this.$groups)
.wrapAll('<optgroup data-action="remove" label="' + t('contacts', 'Remove from...') + '"/>'); .wrapAll('<optgroup data-action="remove" label="' + t('contacts', 'Remove from...') + '"/>');
} }
} else { // Otherwise add all categories to both add and remove } else if(this.Contacts.getSelectedContacts().length > 0) { // Otherwise add all categories to both add and remove
this.$groups.find('optgroup,option:not([value="-1"])').remove(); this.$groups.find('optgroup,option:not([value="-1"])').remove();
var addopts = '', rmopts = ''; var addopts = '', rmopts = '';
$.each(this.Groups.categories, function(i, category) { $.each(this.Groups.categories, function(i, category) {
@ -644,8 +644,10 @@ OC.Contacts = OC.Contacts || {
.wrapAll('<optgroup data-action="add" label="' + t('contacts', 'Add to...') + '"/>'); .wrapAll('<optgroup data-action="add" label="' + t('contacts', 'Add to...') + '"/>');
$(rmopts).appendTo(this.$groups) $(rmopts).appendTo(this.$groups)
.wrapAll('<optgroup data-action="remove" label="' + t('contacts', 'Remove from...') + '"/>'); .wrapAll('<optgroup data-action="remove" label="' + t('contacts', 'Remove from...') + '"/>');
} else {
// 3rd option: No contact open, none checked, just show "Add group..."
this.$groups.find('optgroup,option:not([value="-1"])').remove();
} }
// TODO: 3rd option: No contact open, none checked, just show "Add group..."
$('<option value="add">' + t('contacts', 'Add group...') + '</option>').appendTo(this.$groups); $('<option value="add">' + t('contacts', 'Add group...') + '</option>').appendTo(this.$groups);
this.$groups.val(-1); this.$groups.val(-1);
}, },
@ -941,6 +943,9 @@ OC.Contacts = OC.Contacts || {
console.log('adding', id, 'to', groupname); console.log('adding', id, 'to', groupname);
self.Contacts.contacts[id].addToGroup(groupname); self.Contacts.contacts[id].addToGroup(groupname);
// I don't think this is used... // I don't think this is used...
if(buildnow) {
self.buildGroupSelect();
}
$(document).trigger('status.contact.addedtogroup', { $(document).trigger('status.contact.addedtogroup', {
contactid: id, contactid: id,
groupid: groupid, groupid: groupid,
@ -948,9 +953,6 @@ OC.Contacts = OC.Contacts || {
}); });
}, 1000); }, 1000);
}); });
if(buildnow) {
self.buildGroupSelect();
}
} else { } else {
// TODO: Use message return from Groups object. // TODO: Use message return from Groups object.
OC.notify({message:t('contacts', t('contacts', 'Error adding to group.'))}); OC.notify({message:t('contacts', t('contacts', 'Error adding to group.'))});
@ -966,6 +968,9 @@ OC.Contacts = OC.Contacts || {
var groupname = $opt.text(), groupid = $opt.val(); var groupname = $opt.text(), groupid = $opt.val();
$.each(result.ids, function(idx, id) { $.each(result.ids, function(idx, id) {
self.Contacts.contacts[id].removeFromGroup(groupname); self.Contacts.contacts[id].removeFromGroup(groupname);
if(buildnow) {
self.buildGroupSelect();
}
// If a group is selected the contact has to be removed from the list // If a group is selected the contact has to be removed from the list
$(document).trigger('status.contact.removedfromgroup', { $(document).trigger('status.contact.removedfromgroup', {
contactid: id, contactid: id,
@ -973,9 +978,6 @@ OC.Contacts = OC.Contacts || {
groupname: groupname, groupname: groupname,
}); });
}); });
if(buildnow) {
self.buildGroupSelect();
}
} else { } else {
OC.notify({message:t('contacts', t('contacts', 'Error removing from group.'))}); OC.notify({message:t('contacts', t('contacts', 'Error removing from group.'))});
} }