On 10/28/2010 05:30 PM, Adam Young wrote:
On 10/28/2010 05:22 PM, Adam Young wrote:
delete associations
Uses code very similar to the search code for deleting associations
Only uses the serial means of deletion. While this works for all
deletes,
it is slower than bulk.
_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
Found one problem myself: the '*_remove_member' approach only works
one way, not both for removing associations.
_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
This version matches the serial and bulk associators with the deleter
From f9b4d2723c1087652d03d2a2af850b65d1f04a3c Mon Sep 17 00:00:00 2001
From: Adam Young <ayo...@redhat.com>
Date: Thu, 28 Oct 2010 17:20:12 -0400
Subject: [PATCH] delete associations
Uses code very similar to the search code for deleting associations
Had to modify how we were configuring for bulk so that the logic for delete matched the logic for enroll
---
install/static/associate.js | 199 ++++++++++++++++++++++++++++++++++++----
install/static/group.js | 6 +-
install/static/host.js | 4 +-
install/static/serverconfig.js | 4 +-
install/static/user.js | 8 +-
5 files changed, 190 insertions(+), 31 deletions(-)
diff --git a/install/static/associate.js b/install/static/associate.js
index 7daa0cf..e538e3d 100644
--- a/install/static/associate.js
+++ b/install/static/associate.js
@@ -25,7 +25,7 @@
/**
*This associator is built for the case where each association requires a separate rpc
*/
-function SerialAssociator(form, manyObjPkeys, on_success)
+function serial_associate(form, manyObjPkeys, on_success)
{
var associator = this;
this.form = form;
@@ -59,11 +59,80 @@ function SerialAssociator(form, manyObjPkeys, on_success)
}
}
+
+function serial_delete(delete_method, one_entity, one_entity_pkey, many_entity,
+ many_entity_pkeys, on_success){
+ that = {};
+ that.one_entity = one_entity;
+ that.on_success = on_success;
+ that.many_entity_pkeys = many_entity_pkeys;
+ that.delete_next = function(){
+ var many_entity_pkey = this.many_entity_pkeys.shift();
+ if (many_entity_pkey){
+ var options = {};
+ options[one_entity] = one_entity_pkey;
+ var args = [many_entity_pkey];
+ ipa_cmd( delete_method,args, options ,
+ function(data, text_status, xhr) {
+ if (data.error){
+ alert("error deleting member: "
+ +data.error.message);
+ }else{
+ that.delete_next();
+ }
+ },
+ function(xhr, text_status, error_thrown) {
+ alert("associateFailure");
+ },
+ many_entity );
+ }else{
+ this.on_success();
+ }
+ }
+
+ that.delete_next();
+}
+
+function bulk_delete(delete_method, one_entity, one_entity_pkey, many_entity,
+ many_entity_pkeys, on_success){
+ if (many_entity_pkeys.length){
+ var options = {};
+ options[one_entity] = one_entity_pkey;
+
+ var option = many_entity_pkeys.shift();
+ while(many_entity_pkeys.length > 0) {
+ option += ',' + many_entity_pkeys.shift();
+ }
+
+ var options = {
+ 'all':true
+ };
+ options[many_entity] = option;
+ var args = [one_entity_pkey];
+ ipa_cmd( delete_method,args, options ,
+ function(data, text_status, xhr) {
+ if (data.error){
+ alert("error deleting member: "
+ +data.error.message);
+ }else{
+ on_success();
+ }
+ },
+ function(xhr, text_status, error_thrown) {
+ alert("associateFailure");
+ },
+ one_entity );
+ }else{
+ on_success();
+ }
+}
+
+
/**
*This associator is for the common case where all the asociations can be sent
in a single rpc
*/
-function BulkAssociator(form, manyObjPkeys, on_success)
+function bulk_associate(form, manyObjPkeys, on_success)
{
var associator = this;
this.form = form;
@@ -103,7 +172,7 @@ function BulkAssociator(form, manyObjPkeys, on_success)
* Create a form for a one to many association.
*
*/
-function AssociationForm(oneObj, pkey, manyObj, on_success, associatorConstructor, method)
+function AssociationForm(oneObj, pkey, manyObj, on_success, associator, method)
{
var form = this;
@@ -121,10 +190,9 @@ function AssociationForm(oneObj, pkey, manyObj, on_success, associatorConstructo
else
this.method = 'add_member';
- if (associatorConstructor)
- this.associatorConstructor = associatorConstructor;
- else
- this.associatorConstructor = BulkAssociator;
+ this.associator = associator;
+
+
this.setup = function() {
var label = IPA.metadata[form.manyObj].label;
@@ -204,7 +272,7 @@ function AssociationForm(oneObj, pkey, manyObj, on_success, associatorConstructo
manyObjPkeys.push(selected.value);
});
var associator =
- new this.associatorConstructor(form, manyObjPkeys, on_success);
+ new this.associator(form, manyObjPkeys, on_success);
associator.associateNext();
};
}
@@ -271,7 +339,15 @@ function ipa_association_facet(spec) {
];
var config = that.get_config(that.other_entity);
- that.associator = config ? config.associator : null;
+
+ if ( config && config.associator === 'serial' ){
+ that.associator = serial_associate;
+ that.deleter = serial_delete;
+ }else{
+ that.associator = bulk_associate;
+ that.deleter = bulk_delete;
+ }
+
that.method = config ? config.method : null;
that.setup_views(container);
@@ -284,15 +360,21 @@ function ipa_association_facet(spec) {
container.find('.search-filter').css('display', 'none');
container.find('.search-buttons').html('');
- $('<input/>', {
- type: 'button',
- value: 'enroll',
- click: function() {
- that.show_enrollment_dialog();
- }
- }).appendTo(container.find('.search-buttons'));
+ var ctrls = container.find('.search-buttons');
+
+ ipa_make_button( 'ui-icon-plus',IPA.messages.button.enroll).
+ click(function() {
+ that.show_enrollment_dialog(container);
+ }).appendTo(ctrls);
- var header = $('<tr></tr>').appendTo(container.find('.search-table thead:last'));
+ ipa_make_button('ui-icon-trash',IPA.messages.button.delete).
+ click(function(){
+ that.delete_on_click(container);
+ }).appendTo(ctrls);
+
+
+
+ var header = container.find('.search-table thead:last').find("tr");;
for (var i =0 ; i != that.columns.length ;i++){
$('<th></th>',{
html: that.columns[i].title
@@ -301,21 +383,96 @@ function ipa_association_facet(spec) {
that.refresh(container);
};
+ that.delete_on_click = function(container) {
+ var delete_list = [];
+ var delete_dialog = $('<div></div>', {
+ title: IPA.messages.button.delete,
+ 'class': 'search-dialog-delete'
+ });
+
+ function delete_on_click() {
+ that.deleter('remove_member', that.entity_name,
+ that.pkey, that.other_entity, delete_list,
+ function(){ that.refresh(container)});
+ delete_dialog.dialog('close');
+ }
+ function delete_on_win() {
+ delete_dialog.dialog('close');
+ }
+ function cancel_on_click() {
+ delete_dialog.dialog('close');
+ }
+ var confirm_list = $('<ul/>');
+ var delete_list = [];
+ container.find('.search-selector').each(function () {
+ if (this.checked){
+ delete_list.push(this.title);
+ confirm_list.append($('<li/>',{text: this.title}));
+ }
+ });
+ if (delete_list.length == 0){
+ return;
+ }
+ delete_dialog.append(confirm_list);
+ delete_dialog.append(
+ $('<p/>',
+ {text:IPA.messages.search.delete_confirm}));
+
+
+ delete_dialog.dialog({
+ modal: true,
+ buttons: {
+ 'Delete': delete_on_click,
+ 'Cancel': cancel_on_click
+ }
+ });
+ }
+
that.refresh = function(container) {
function refresh_on_success(data, text_status, xhr) {
var tbody = container.find('.search-table tbody');
tbody.empty();
var associationList = data.result.result[that.columns[0].column];
+ //TODO, this is masking an error where the wrong
+ //direction association is presented upon page reload.
+ //if the associationList is unset, it is because
+ //form.associationColumns[0] doesn't exist in the results
+ if (!associationList) return;
+
+
for (var j = 0; j < associationList.length; j++){
+ var association = associationList[j];
var row = $('<tr/>').appendTo(tbody);
+ search_generate_checkbox_td(row, association);
+
+
for (var k = 0; k < that.columns.length ;k++){
var column = that.columns[k].column;
$('<td></td>',{
- html: data.result.result[column][j]
+ html: $('<a/>',{
+ href: 'jslink',
+ text: data.result.result[column][j],
+ "class": "search-a-pkey",
+
+ })
}).appendTo(row);
}
}
+
+ tbody.find('.search-a-pkey').click(function () {
+ var jobj = $(this);
+ var state = {};
+ state[that.other_entity + '-facet'] = 'details';
+ state[that.other_entity + '-pkey'] = $(this).text();
+ //Before this will work, we need to set the tab one level up
+ //for example:
+ //state['identity'] = 0;
+ //but we have no way of getting the index.
+
+ $.bbq.pushState(state);
+ return (false);
+ });
}
function refresh_on_error(xhr, text_status, error_thrown) {
@@ -328,14 +485,16 @@ function ipa_association_facet(spec) {
ipa_cmd('show', [that.pkey], {}, refresh_on_success, refresh_on_error, that.entity_name);
};
- that.show_enrollment_dialog = function() {
+ that.show_enrollment_dialog = function(container) {
+
+
var enrollment_dialog = new AssociationForm(
that.entity_name,
that.pkey,
that.other_entity,
function() {
- that.refresh();
+ that.refresh(container);
enrollment_dialog.close();
},
that.associator,
diff --git a/install/static/group.js b/install/static/group.js
index 1a66c92..1d1e9b5 100644
--- a/install/static/group.js
+++ b/install/static/group.js
@@ -44,9 +44,9 @@ ipa_entity_set_details_definition('group',[
]);
ipa_entity_set_association_definition('group', {
- 'netgroup': { associator: SerialAssociator },
- 'rolegroup': { associator: SerialAssociator },
- 'taskgroup': { associator: SerialAssociator }
+ 'netgroup': { associator: 'serial' },
+ 'rolegroup': { associator: 'serial' },
+ 'taskgroup': { associator: 'serial' }
});
function f_posix(dlg, mode)
diff --git a/install/static/host.js b/install/static/host.js
index c4d110a..8407e26 100644
--- a/install/static/host.js
+++ b/install/static/host.js
@@ -48,8 +48,8 @@ ipa_entity_set_details_definition('host', [
]);
ipa_entity_set_association_definition('host', {
- 'hostgroup': { associator: SerialAssociator },
- 'rolegroup': { associator: SerialAssociator }
+ 'hostgroup': { associator: 'serial' },
+ 'rolegroup': { associator: 'serial' }
});
function host_enrollment_status_load(container, dt, result) {
diff --git a/install/static/serverconfig.js b/install/static/serverconfig.js
index cb61265..327616a 100644
--- a/install/static/serverconfig.js
+++ b/install/static/serverconfig.js
@@ -70,7 +70,7 @@ ipa_entity_set_association_definition('taskgroup', {
});
ipa_entity_set_association_definition('rolegroup', {
- 'rolegroup': { associator: BulkAssociator }
+ 'rolegroup': { }
});
@@ -98,7 +98,7 @@ ipa_entity_set_details_definition('rolegroup', [
]);
ipa_entity_set_association_definition('rolegroup', {
- 'taskgroup': { associator: SerialAssociator }
+ 'taskgroup': { associator: 'serial' }
});
/* Configuration */
diff --git a/install/static/user.js b/install/static/user.js
index 3ac828f..5645967 100644
--- a/install/static/user.js
+++ b/install/static/user.js
@@ -75,10 +75,10 @@ ipa_entity_set_details_definition('user', [
]);
ipa_entity_set_association_definition('user', {
- 'group': { associator: SerialAssociator },
- 'netgroup': { associator: SerialAssociator },
- 'rolegroup': { associator: SerialAssociator },
- 'taskgroup': { associator: SerialAssociator }
+ 'group': { associator: 'serial' },
+ 'netgroup': { associator: 'serial' },
+ 'rolegroup': { associator: 'serial' },
+ 'taskgroup': { associator: 'serial' }
});
/* Account status Toggle button */
--
1.7.1
_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
