mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Use modified entity find commands for associations
https://fedorahosted.org/freeipa/ticket/1011 Does not completely fix the problem in the ticket, but it does mitigate the failure.
This commit is contained in:
parent
cd61ef61ad
commit
81fd790cda
@ -430,8 +430,12 @@ IPA.association_table_widget = function (spec) {
|
|||||||
'on_success': on_success,
|
'on_success': on_success,
|
||||||
'on_error': on_error
|
'on_error': on_error
|
||||||
});
|
});
|
||||||
|
var length = that.values.length;
|
||||||
|
if (length > 100){
|
||||||
|
length = 100;
|
||||||
|
}
|
||||||
|
|
||||||
for (var i=0; i<that.values.length; i++) {
|
for (var i=0; i< length; i++) {
|
||||||
var value = that.values[i];
|
var value = that.values[i];
|
||||||
|
|
||||||
var command = IPA.command({
|
var command = IPA.command({
|
||||||
@ -917,28 +921,29 @@ IPA.association_facet = function (spec) {
|
|||||||
|
|
||||||
if (!pkeys.length) return;
|
if (!pkeys.length) return;
|
||||||
|
|
||||||
var batch = IPA.batch_command({
|
|
||||||
'name': that.entity_name+'_'+that.name,
|
var options = {
|
||||||
|
'all': true,
|
||||||
|
'rights': true
|
||||||
|
};
|
||||||
|
|
||||||
|
var pkey = $.bbq.getState(that.entity_name + '-pkey', true) || '';
|
||||||
|
var args =[];
|
||||||
|
/* TODO: make a general solution to generate this value */
|
||||||
|
var relationship_filter = 'in_' + that.entity_name;
|
||||||
|
options[relationship_filter] = pkey;
|
||||||
|
|
||||||
|
var command = IPA.command({
|
||||||
'on_success': on_success,
|
'on_success': on_success,
|
||||||
'on_error': on_error
|
'on_error': on_error,
|
||||||
|
'method': that.other_entity+'_find',
|
||||||
|
'args': args,
|
||||||
|
options: options
|
||||||
});
|
});
|
||||||
|
|
||||||
for (var i=0; i<pkeys.length; i++) {
|
command.execute();
|
||||||
var pkey = pkeys[i];
|
|
||||||
|
|
||||||
var command = IPA.command({
|
|
||||||
'method': that.other_entity+'_show',
|
|
||||||
'args': [pkey],
|
|
||||||
'options': {
|
|
||||||
'all': true,
|
|
||||||
'rights': true
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
batch.add_command(command);
|
|
||||||
}
|
|
||||||
|
|
||||||
batch.execute();
|
|
||||||
};
|
};
|
||||||
|
|
||||||
that.refresh = function() {
|
that.refresh = function() {
|
||||||
@ -962,9 +967,9 @@ IPA.association_facet = function (spec) {
|
|||||||
that.get_records(
|
that.get_records(
|
||||||
pkeys,
|
pkeys,
|
||||||
function(data, text_status, xhr) {
|
function(data, text_status, xhr) {
|
||||||
var results = data.result.results;
|
var results = data.result.result;
|
||||||
for (var i=0; i<results.length; i++) {
|
for (var i=0; i<results.length; i++) {
|
||||||
var record = results[i].result;
|
var record = results[i];
|
||||||
that.table.add_record(record);
|
that.table.add_record(record);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -50,7 +50,7 @@ IPA.entity_factories.host = function () {
|
|||||||
that.add_facet(facet);
|
that.add_facet(facet);
|
||||||
|
|
||||||
facet = IPA.host_managedby_host_facet({
|
facet = IPA.host_managedby_host_facet({
|
||||||
'name': 'managedby_host'
|
name: 'managedby_host'
|
||||||
});
|
});
|
||||||
that.add_facet(facet);
|
that.add_facet(facet);
|
||||||
|
|
||||||
@ -503,18 +503,12 @@ IPA.host_managedby_host_facet = function (spec) {
|
|||||||
}).appendTo(container);
|
}).appendTo(container);
|
||||||
};
|
};
|
||||||
|
|
||||||
that.create_column({name: 'description'});
|
|
||||||
|
|
||||||
that.create_adder_column({
|
that.create_adder_column({
|
||||||
name: 'fqdn',
|
name: 'fqdn',
|
||||||
primary_key: true,
|
primary_key: true,
|
||||||
width: '100px'
|
width: '200px'
|
||||||
});
|
});
|
||||||
|
|
||||||
that.create_adder_column({
|
|
||||||
name: 'description',
|
|
||||||
width: '100px'
|
|
||||||
});
|
|
||||||
|
|
||||||
that.association_facet_init();
|
that.association_facet_init();
|
||||||
};
|
};
|
||||||
|
@ -395,17 +395,11 @@ IPA.service_managedby_host_facet = function(spec) {
|
|||||||
}).appendTo(container);
|
}).appendTo(container);
|
||||||
};
|
};
|
||||||
|
|
||||||
that.create_column({name: 'description'});
|
|
||||||
|
|
||||||
that.create_adder_column({
|
that.create_adder_column({
|
||||||
name: 'fqdn',
|
name: 'fqdn',
|
||||||
primary_key: true,
|
primary_key: true,
|
||||||
width: '100px'
|
width: '200px'
|
||||||
});
|
|
||||||
|
|
||||||
that.create_adder_column({
|
|
||||||
name: 'description',
|
|
||||||
width: '100px'
|
|
||||||
});
|
});
|
||||||
|
|
||||||
that.association_facet_init();
|
that.association_facet_init();
|
||||||
|
Loading…
Reference in New Issue
Block a user