Fixed association facets.

The association config has been removed because it incorrectly assumes there is only one association between two entities. Now each association is defined separately using association facets.

The service.py has been modified to specify the correct relationships. The API.txt has been updated.

https://fedorahosted.org/freeipa/ticket/960

1 files changed, 23 insertions, 15 deletions

diff --git a/install/ui/aci.js b/install/ui/aci.js
index 89caec040..4df65f3ff 100644
--- a/install/ui/aci.js
+++ b/install/ui/aci.js
@@ -559,8 +559,8 @@ IPA.entity_factories.permission = function() {
                     IPA.stanza({name:'identity', label:'Identity'}).
                         input({name: 'cn', 'read_only': true})).
                 section(IPA.rights_section()).
-                section(IPA.target_section({name: 'target', label: 'Target'})));
-
+                section(IPA.target_section({name: 'target', label: 'Target'}))).
+        standard_associations();
 };
 
 
@@ -586,15 +586,21 @@ IPA.entity_factories.privilege = function() {
                     IPA.stanza({name:'identity', label:'Privilege Settings'}).
                         input({name:'cn'}).
                         input({name: 'description'}))).
-    association({
-        name: 'permission',
-        other_entity: 'privilege',
-        add_method: 'add_permission',
-        remove_method: 'remove_permission'
-    }).
-
-    standard_associations();
+        facet(
+            IPA.association_facet({
+                name: 'member_role',
+                add_method: 'add_privilege',
+                remove_method: 'remove_privilege',
+                associator: IPA.serial_associator
+            })).
+        facet(
+            IPA.association_facet({
+                name: 'memberof_permission',
+                add_method: 'add_permission',
+                remove_method: 'remove_permission'
+            })).
 
+        standard_associations();
 
     return that;
 };
@@ -622,11 +628,13 @@ IPA.entity_factories.role = function() {
                     IPA.stanza({name:'identity', label:'Role Settings'}).
                         input({name:'cn'}).
                         input({name: 'description'}))).
-        association({
-            name: 'privilege',
-            add_method: 'add_privilege',
-            remove_method: 'remove_privilege'
-        }).
+        facet(
+            IPA.association_facet({
+                name: 'memberof_privilege',
+                add_method: 'add_privilege',
+                remove_method: 'remove_privilege'
+            })).
+
         standard_associations();
 };