Re: [Freeipa-devel] [PATCH] admiyo-0182-association-fixes
On 1/31/2011 7:11 PM, Adam Young wrote: On 01/31/2011 07:20 PM, Adam Young wrote: This is necessary, but not sure if it is suffcieint. THere is at least one problem still: group->users doesn't allow enrollment. Need to fix that, but should be in a follow on patch. Fixes the part about "group->users doesn't allow enrollment." ACK and pushed to master. -- Endi S. Dewata ___ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
Re: [Freeipa-devel] [PATCH] admiyo-0182-association-fixes
On 01/31/2011 07:20 PM, Adam Young wrote:
This is necessary, but not sure if it is suffcieint. THere is at
least one problem still: group->users doesn't allow enrollment. Need
to fix that, but should be in a follow on patch.
___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
Fixes the part about "group->users doesn't allow enrollment."
From 96e0f5abd3007c7cc691feab6029071146409fc5 Mon Sep 17 00:00:00 2001
From: Adam Young
Date: Mon, 31 Jan 2011 19:17:39 -0500
Subject: [PATCH] association fixes
PLaces custom association facets into the proper facet groups
usesthe associators if they are specifiedfor an association
---
install/ui/associate.js |3 ++-
install/ui/entity.js| 35 +++
2 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/install/ui/associate.js b/install/ui/associate.js
index 9fc90723045f444cec3f41b051538d18d7ab62e5..bdb10337a33b3d5e4e5bc3b43a36d79114996e68 100644
--- a/install/ui/associate.js
+++ b/install/ui/associate.js
@@ -699,8 +699,9 @@ IPA.association_facet = function (spec) {
var relationships = IPA.metadata[that.entity_name].relationships;
var relationship = relationships[that.attribute_member];
-if (!relationship)
+if (!relationship){
relationship = ['', '', ''];
+}
/* TODO: I18N and some generic handling of different relationships */
var header_message = '';
diff --git a/install/ui/entity.js b/install/ui/entity.js
index 7f195a147dad7e09e4f2b9b666553ce4e23ea94c..82af8234e1ac4a27068fa7a956b8e3be7153af24 100644
--- a/install/ui/entity.js
+++ b/install/ui/entity.js
@@ -180,13 +180,36 @@ IPA.entity = function (spec) {
that.entity_name, other_entity);
}
-return IPA.association_facet({
-'name': attribute_member+'_'+other_entity,
+var association_name= attribute_member+'_'+other_entity;
+
+//TODO remove from the facets and facets_by_name collections
+var facet = that.get_facet(association_name);
+if (facet){
+facet.facet_group = facet_group;
+facet.attribute_member = attribute_member;
+return;
+}
+
+var config = that.get_association(other_entity);
+if (!config){
+config = that.get_association(association_name);
+}
+
+var spec ={
+'name': association_name,
'label': label,
'other_entity': other_entity,
'facet_group': facet_group,
'attribute_member': attribute_member
-});
+};
+
+if (config){
+spec.associator = config.associator;
+}
+
+facet = IPA.association_facet(spec);
+
+that.add_facet(facet);
};
that.create_association_facets = function() {
@@ -214,12 +237,8 @@ IPA.entity = function (spec) {
relationship = ['Member', '', 'no_'];
var facet_group = relationship[0];
-var facet = that.create_association_facet(
+that.create_association_facet(
attribute_member, other_entity, label, facet_group);
-
-if (that.get_facet(facet.name)) continue;
-
-that.add_facet(facet);
}
}
return that;
--
1.7.3.5
___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
Re: [Freeipa-devel] [PATCH] admiyo-0182-association-fixes
On 01/31/2011 07:20 PM, Adam Young wrote: This is necessary, but not sure if it is suffcieint. THere is at least one problem still: group->users doesn't allow enrollment. Need to fix that, but should be in a follow on patch. ___ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel NACK my self...got a slightly better one coming. ___ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
[Freeipa-devel] [PATCH] admiyo-0182-association-fixes
This is necessary, but not sure if it is suffcieint. THere is at least
one problem still: group->users doesn't allow enrollment. Need to fix
that, but should be in a follow on patch.
From a8080d963dac0d7769d32dfc74efbec99bbb7125 Mon Sep 17 00:00:00 2001
From: Adam Young
Date: Mon, 31 Jan 2011 19:17:39 -0500
Subject: [PATCH] association fixes
PLaces custom association facets into the proper facet groups
usesthe associators if they are specifiedfor an association
---
install/ui/entity.js | 34 ++
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/install/ui/entity.js b/install/ui/entity.js
index 7f195a147dad7e09e4f2b9b666553ce4e23ea94c..951b58798fd2a675e7c3f09a5720b29363042f05 100644
--- a/install/ui/entity.js
+++ b/install/ui/entity.js
@@ -180,13 +180,35 @@ IPA.entity = function (spec) {
that.entity_name, other_entity);
}
-return IPA.association_facet({
-'name': attribute_member+'_'+other_entity,
+var association_name= attribute_member+'_'+other_entity;
+
+//TODO remove from the facets and facets_by_name collections
+var facet = that.get_facet(association_name);
+if (facet){
+facet.facet_group = facet_group;
+return;
+}
+
+var config = that.get_association(other_entity);
+if (!config){
+config = that.get_association(association_name);
+}
+
+var spec ={
+'name': association_name,
'label': label,
'other_entity': other_entity,
'facet_group': facet_group,
'attribute_member': attribute_member
-});
+};
+
+if (config){
+spec.associator = config.associator;
+}
+
+facet = IPA.association_facet(spec);
+
+that.add_facet(facet);
};
that.create_association_facets = function() {
@@ -214,12 +236,8 @@ IPA.entity = function (spec) {
relationship = ['Member', '', 'no_'];
var facet_group = relationship[0];
-var facet = that.create_association_facet(
+that.create_association_facet(
attribute_member, other_entity, label, facet_group);
-
-if (that.get_facet(facet.name)) continue;
-
-that.add_facet(facet);
}
}
return that;
--
1.7.3.5
___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
