Move spec creations of sudorule, hbacrule, netgroup and selinuxusermap details facet from their factories

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

1 files changed, 24 insertions, 14 deletions

diff --git a/install/ui/src/freeipa/hbac.js b/install/ui/src/freeipa/hbac.js
index 0c7b95c95..dc29fad55 100644
--- a/install/ui/src/freeipa/hbac.js
+++ b/install/ui/src/freeipa/hbac.js
@@ -24,10 +24,12 @@ define([
         './jquery',
         './phases',
         './reg',
-        './details',
-        './search',
         './association',
-        './entity'],
+        './details',
+        './entity',
+        './rule',
+        './search'
+        ],
             function(IPA, $, phases, reg) {
 
 var exp = IPA.hbac = {
@@ -36,7 +38,7 @@ var exp = IPA.hbac = {
 };
 
 var make_rule_spec = function() {
-return {
+var spec =  {
     name: 'hbacrule',
     facets: [
         {
@@ -97,7 +99,11 @@ return {
     adder_dialog: {
         fields: [ 'cn' ]
     }
-};};
+};
+
+    add_hbacrule_details_facet_widgets(spec.facets[1]);
+    return spec;
+};
 
 var make_service_spec = function() {
 return {
@@ -218,9 +224,10 @@ return {
     }
 };};
 
-IPA.hbacrule_details_facet = function(spec) {
-
-    var entity_name = spec.entity.name;
+/**
+ * @param {Object} facet spec
+ */
+var add_hbacrule_details_facet_widgets = function (spec) {
 
     //
     // General
@@ -303,7 +310,7 @@ IPA.hbacrule_details_facet = function(spec) {
                     widgets: [
                         {
                             $type: 'rule_association_table',
-                            id: entity_name+'-memberuser_user',
+                            id: 'hbacrule-memberuser_user',
                             name: 'memberuser_user',
                             add_method: 'add_user',
                             remove_method: 'remove_user',
@@ -312,7 +319,7 @@ IPA.hbacrule_details_facet = function(spec) {
                         },
                         {
                             $type: 'rule_association_table',
-                            id: entity_name+'-memberuser_group',
+                            id: 'hbacrule-memberuser_group',
                             name: 'memberuser_group',
                             add_method: 'add_user',
                             remove_method: 'remove_user',
@@ -376,7 +383,7 @@ IPA.hbacrule_details_facet = function(spec) {
                     widgets: [
                         {
                             $type: 'rule_association_table',
-                            id: entity_name+'-memberuser_user',
+                            id: 'hbacrule-memberuser_user',
                             name: 'memberhost_host',
                             add_method: 'add_host',
                             remove_method: 'remove_host',
@@ -385,7 +392,7 @@ IPA.hbacrule_details_facet = function(spec) {
                         },
                         {
                             $type: 'rule_association_table',
-                            id: entity_name+'-memberuser_group',
+                            id: 'hbacrule-memberuser_group',
                             name: 'memberhost_hostgroup',
                             add_method: 'add_host',
                             remove_method: 'remove_host',
@@ -443,7 +450,7 @@ IPA.hbacrule_details_facet = function(spec) {
                     widgets: [
                         {
                             $type: 'rule_association_table',
-                            id: entity_name+'-memberuser_user',
+                            id: 'hbacrule-memberuser_user',
                             name: 'memberservice_hbacsvc',
                             add_method: 'add_service',
                             remove_method: 'remove_service',
@@ -452,7 +459,7 @@ IPA.hbacrule_details_facet = function(spec) {
                         },
                         {
                             $type: 'rule_association_table',
-                            id: entity_name+'-memberuser_group',
+                            id: 'hbacrule-memberuser_group',
                             name: 'memberservice_hbacsvcgroup',
                             add_method: 'add_service',
                             remove_method: 'remove_service',
@@ -464,6 +471,9 @@ IPA.hbacrule_details_facet = function(spec) {
             ]
         }
     );
+};
+
+IPA.hbacrule_details_facet = function(spec) {
 
     var that = IPA.details_facet(spec);