On 11/2/2011 11:01 AM, Petr Vobornik wrote:
Regardless, ACK and pushed to master.
Found another problem, the krbtpolicy & config need to be forced to update. See the attached patch.
-- Endi S. Dewata
From fc3895f69dbf15f37d81f5dffad59a17a2953a03 Mon Sep 17 00:00:00 2001 From: Endi S. Dewata <[email protected]> Date: Thu, 3 Nov 2011 16:02:32 -0500 Subject: [PATCH] Fixed blank krbtpolicy and config pages. The details page compares the old and the new primary keys to determine if the page needs to be reloaded. The Kerberos Ticket Policy and Config pages do not use primary keys, so they are never loaded/updated with data. A parameter has been added to force update on these pages. Ticket #1459 --- install/ui/association.js | 1 + install/ui/details.js | 1 + install/ui/entity.js | 2 ++ install/ui/policy.js | 15 +++++++++++---- install/ui/serverconfig.js | 13 +++++++------ 5 files changed, 22 insertions(+), 10 deletions(-) diff --git a/install/ui/association.js b/install/ui/association.js index d3d6b124b431414ff04fad05b16dbb972b38c2b7..6ce8fea46caa57638273d53518ce0472df58ac2d 100644 --- a/install/ui/association.js +++ b/install/ui/association.js @@ -1206,6 +1206,7 @@ IPA.association_facet = function (spec) { }; that.needs_update = function() { + if (that._needs_update !== undefined) return that._needs_update; var pkey = IPA.nav.get_state(that.entity.name+'-pkey'); return that.pkey !== pkey; }; diff --git a/install/ui/details.js b/install/ui/details.js index 15056204f72ef2095862c2c35d24cd47fbc819b3..93bb3e8a404bb24374e64bfeb824869f531a7f96 100644 --- a/install/ui/details.js +++ b/install/ui/details.js @@ -528,6 +528,7 @@ IPA.details_facet = function(spec) { }; that.needs_update = function() { + if (that._needs_update !== undefined) return that._needs_update; var pkey = IPA.nav.get_state(that.entity.name+'-pkey'); return pkey !== that.pkey; }; diff --git a/install/ui/entity.js b/install/ui/entity.js index ace44c3c1fef43e8a8700038c5305391ae3106a4..526e2795d94512add214af785a8442e18192d171 100644 --- a/install/ui/entity.js +++ b/install/ui/entity.js @@ -44,6 +44,7 @@ IPA.facet = function (spec) { that.header = spec.header || IPA.facet_header({ facet: that }); that.entity_name = spec.entity_name; + that._needs_update = spec.needs_update; that.dialogs = $.ordered_map(); @@ -113,6 +114,7 @@ IPA.facet = function (spec) { }; that.needs_update = function() { + if (that._needs_update !== undefined) return that._needs_update; return true; }; diff --git a/install/ui/policy.js b/install/ui/policy.js index 41432f743e2b894cb4a8d2a9b338bacc85b8c762..f773c4714bf1f62305d261dd42a8bc20195f8d9b 100644 --- a/install/ui/policy.js +++ b/install/ui/policy.js @@ -76,9 +76,16 @@ IPA.entity_factories.krbtpolicy = function() { entity('krbtpolicy'). details_facet({ title: IPA.metadata.objects.krbtpolicy.label, - sections:[{ - name: 'identity', - fields:[ 'krbmaxrenewableage','krbmaxticketlife' ] - }]}). + sections: [ + { + name: 'identity', + fields: [ + 'krbmaxrenewableage', + 'krbmaxticketlife' + ] + } + ], + needs_update: true + }). build(); }; diff --git a/install/ui/serverconfig.js b/install/ui/serverconfig.js index 6dc2eaf6dec7ae49a69fe91ecb7779076534ab62..eec47d2f77647427f5a465f2bec1dd8648a8b506 100644 --- a/install/ui/serverconfig.js +++ b/install/ui/serverconfig.js @@ -32,12 +32,11 @@ IPA.entity_factories.config = function(){ entity('config'). details_facet({ title: IPA.metadata.objects.config.label, - sections: - [ + sections: [ { name: 'search', label: IPA.messages.objects.config.search, - fields:[ + fields: [ 'ipasearchrecordslimit', 'ipasearchtimelimit' ] @@ -45,7 +44,7 @@ IPA.entity_factories.config = function(){ { name: 'user', label: IPA.messages.objects.config.user, - fields:[ + fields: [ 'ipausersearchfields', 'ipadefaultemaildomain', { @@ -71,7 +70,7 @@ IPA.entity_factories.config = function(){ { name: 'group', label: IPA.messages.objects.config.group, - fields:[ + fields: [ 'ipagroupsearchfields', { factory: IPA.multivalued_text_widget, @@ -79,6 +78,8 @@ IPA.entity_factories.config = function(){ } ] } - ]}). + ], + needs_update: true + }). build(); }; \ No newline at end of file -- 1.7.5.1
_______________________________________________ Freeipa-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/freeipa-devel
