summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--install/ui/src/freeipa/aci.js15
-rw-r--r--install/ui/src/freeipa/automember.js10
-rw-r--r--install/ui/src/freeipa/automount.js5
-rwxr-xr-xinstall/ui/src/freeipa/certificate.js29
-rw-r--r--install/ui/src/freeipa/details.js7
-rw-r--r--install/ui/src/freeipa/dns.js14
-rw-r--r--install/ui/src/freeipa/entity.js18
-rw-r--r--install/ui/src/freeipa/host.js18
-rw-r--r--install/ui/src/freeipa/idrange.js5
-rw-r--r--install/ui/src/freeipa/service.js16
-rw-r--r--install/ui/src/freeipa/trust.js5
-rw-r--r--install/ui/test/aci_tests.js5
12 files changed, 93 insertions, 54 deletions
diff --git a/install/ui/src/freeipa/aci.js b/install/ui/src/freeipa/aci.js
index d7d952e5c..c98edd168 100644
--- a/install/ui/src/freeipa/aci.js
+++ b/install/ui/src/freeipa/aci.js
@@ -132,7 +132,10 @@ IPA.aci.permission_entity = function(spec) {
}
],
policies: [
- IPA.permission_target_policy('target')
+ {
+ $factory: IPA.permission_target_policy,
+ widget_name: 'target'
+ }
]
}).
association_facet({
@@ -217,7 +220,10 @@ IPA.aci.permission_entity = function(spec) {
}
],
policies: [
- IPA.permission_target_policy('target')
+ {
+ $factory: IPA.permission_target_policy,
+ widget_name: 'target'
+ }
]
});
};
@@ -740,13 +746,14 @@ IPA.permission_target_widget = function(spec) {
return that;
};
-IPA.permission_target_policy = function (widget_name) {
+IPA.permission_target_policy = function (spec) {
var that = IPA.facet_policy();
+ that.widget_name = spec.widget_name;
that.init = function() {
- that.permission_target = that.container.widgets.get_widget(widget_name);
+ that.permission_target = that.container.widgets.get_widget(that.widget_name);
var widgets = that.permission_target.widgets;
var target_select = widgets.get_widget('target');
diff --git a/install/ui/src/freeipa/automember.js b/install/ui/src/freeipa/automember.js
index 25af15d14..c163e188e 100644
--- a/install/ui/src/freeipa/automember.js
+++ b/install/ui/src/freeipa/automember.js
@@ -45,14 +45,16 @@ IPA.automember.entity = function(spec) {
spec = spec || {};
spec.policies = spec.policies || [
- IPA.facet_update_policy({
+ {
+ $factory: IPA.facet_update_policy,
source_facet: 'usergrouprule',
dest_facet: 'searchgroup'
- }),
- IPA.facet_update_policy({
+ },
+ {
+ $factory: IPA.facet_update_policy,
source_facet: 'hostgrouprule',
dest_facet: 'searchhostgroup'
- })
+ }
];
var that = IPA.entity(spec);
diff --git a/install/ui/src/freeipa/automount.js b/install/ui/src/freeipa/automount.js
index eb63266b4..10d97368a 100644
--- a/install/ui/src/freeipa/automount.js
+++ b/install/ui/src/freeipa/automount.js
@@ -157,11 +157,12 @@ IPA.automount.key_entity = function(spec) {
spec = spec || {};
spec.policies = spec.policies || [
- IPA.facet_update_policy({
+ {
+ $factory: IPA.facet_update_policy,
source_facet: 'details',
dest_entity: 'automountmap',
dest_facet: 'keys'
- })
+ }
];
var that = IPA.entity(spec);
diff --git a/install/ui/src/freeipa/certificate.js b/install/ui/src/freeipa/certificate.js
index 4553a6a29..b18e2ae50 100755
--- a/install/ui/src/freeipa/certificate.js
+++ b/install/ui/src/freeipa/certificate.js
@@ -948,22 +948,25 @@ IPA.cert.entity = function(spec) {
spec = spec || {};
spec.policies = spec.policies || [
- IPA.search_facet_update_policy(),
- IPA.details_facet_update_policy(),
- IPA.cert.cert_update_policy({
+ IPA.search_facet_update_policy,
+ IPA.details_facet_update_policy,
+ {
+ $factory: IPA.cert.cert_update_policy,
source_facet: 'details',
dest_facet: 'search'
- }),
- IPA.cert.cert_update_policy({
+ },
+ {
+ $factory: IPA.cert.cert_update_policy,
source_facet: 'details',
dest_entity: 'host',
dest_facet: 'details'
- }),
- IPA.cert.cert_update_policy({
+ },
+ {
+ $factory: IPA.cert.cert_update_policy,
source_facet: 'details',
dest_entity: 'service',
dest_facet: 'details'
- })
+ }
];
var that = IPA.entity(spec);
@@ -1174,11 +1177,15 @@ IPA.cert.entity = function(spec) {
}
],
policies: [
- IPA.cert.load_policy({ has_reason: true}),
- IPA.hide_empty_row_policy({
+ {
+ $factory: IPA.cert.load_policy,
+ has_reason: true
+ },
+ {
+ $factory: IPA.hide_empty_row_policy,
widget: 'revocation_reason',
section: 'details'
- })
+ }
]
});
};
diff --git a/install/ui/src/freeipa/details.js b/install/ui/src/freeipa/details.js
index 8c6332e1b..4388eb856 100644
--- a/install/ui/src/freeipa/details.js
+++ b/install/ui/src/freeipa/details.js
@@ -24,6 +24,7 @@
/* IPA Object Details - populating definiton lists from entry data */
define([
+ './builder',
'./ipa',
'./jquery',
'./phases',
@@ -31,7 +32,7 @@ define([
'./text',
'./facet',
'./add'],
- function(IPA, $, phases, reg, text) {
+ function(builder, IPA, $, phases, reg, text) {
var exp = {};
@@ -232,7 +233,9 @@ exp.facet_policies = IPA.facet_policies = function(spec) {
}
};
- that.add_policies(spec.policies);
+ var policies = builder.build('', spec.policies, {},
+ { $factory: exp.facet_policy }) || [];
+ that.add_policies(policies);
return that;
};
diff --git a/install/ui/src/freeipa/dns.js b/install/ui/src/freeipa/dns.js
index e42d4a1b9..b4dbf1acd 100644
--- a/install/ui/src/freeipa/dns.js
+++ b/install/ui/src/freeipa/dns.js
@@ -325,7 +325,7 @@ IPA.dns.zone_entity = function(spec) {
}
],
policies: [
- IPA.add_dns_zone_name_policy()
+ IPA.add_dns_zone_name_policy
]
});
};
@@ -1134,12 +1134,13 @@ IPA.dns.record_entity = function(spec) {
spec = spec || {};
spec.policies = spec.policies || [
- IPA.facet_update_policy({
+ {
+ $factory: IPA.facet_update_policy,
source_facet: 'details',
dest_entity: 'dnszone',
dest_facet: 'records'
- }),
- IPA.adder_facet_update_policy()
+ },
+ IPA.adder_facet_update_policy
];
var that = IPA.entity(spec);
@@ -1212,9 +1213,10 @@ IPA.dns.record_entity = function(spec) {
}
],
policies: [
- IPA.dnsrecord_adder_dialog_type_policy({
+ {
+ $factory: IPA.dnsrecord_adder_dialog_type_policy,
type_field: 'record_type'
- })
+ }
]
});
};
diff --git a/install/ui/src/freeipa/entity.js b/install/ui/src/freeipa/entity.js
index 3e054467c..b002fd877 100644
--- a/install/ui/src/freeipa/entity.js
+++ b/install/ui/src/freeipa/entity.js
@@ -21,16 +21,22 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-define(['./ipa', './jquery', './text', './facets', './facet'],
- function(IPA, $, text, facet_reg) {
+define([
+ './builder',
+ './ipa',
+ './jquery',
+ './text',
+ './facets',
+ './facet'],
+ function(builder, IPA, $, text, facet_reg) {
IPA.entity = function(spec) {
spec = spec || {};
spec.policies = spec.policies || [
- IPA.search_facet_update_policy(),
- IPA.details_facet_update_policy()
+ IPA.search_facet_update_policy,
+ IPA.details_facet_update_policy
];
var that = IPA.object();
@@ -487,7 +493,9 @@ IPA.entity_policies = function(spec) {
}
};
- that.add_policies(spec.policies);
+ var policies = builder.build('', spec.policies, {},
+ { $factory: IPA.entity_policy }) || [];
+ that.add_policies(policies);
return that;
};
diff --git a/install/ui/src/freeipa/host.js b/install/ui/src/freeipa/host.js
index cfa282673..3292e1c7a 100644
--- a/install/ui/src/freeipa/host.js
+++ b/install/ui/src/freeipa/host.js
@@ -38,18 +38,20 @@ IPA.host.entity = function(spec) {
spec = spec || {};
spec.policies = spec.policies || [
- IPA.search_facet_update_policy(),
- IPA.details_facet_update_policy(),
- IPA.cert.cert_update_policy({
+ IPA.search_facet_update_policy,
+ IPA.details_facet_update_policy,
+ {
+ $factory: IPA.cert.cert_update_policy,
source_facet: 'details',
dest_entity: 'cert',
dest_facet: 'details'
- }),
- IPA.cert.cert_update_policy({
+ },
+ {
+ $factory: IPA.cert.cert_update_policy,
source_facet: 'details',
dest_entity: 'cert',
dest_facet: 'search'
- })
+ }
];
var that = IPA.entity(spec);
@@ -176,8 +178,8 @@ IPA.host.entity = function(spec) {
]
},
policies: [
- IPA.host.enrollment_policy(),
- IPA.host.certificate_policy()
+ IPA.host.enrollment_policy,
+ IPA.host.certificate_policy
]
}).
association_facet({
diff --git a/install/ui/src/freeipa/idrange.js b/install/ui/src/freeipa/idrange.js
index f2eb4a8ba..7598e4fff 100644
--- a/install/ui/src/freeipa/idrange.js
+++ b/install/ui/src/freeipa/idrange.js
@@ -148,9 +148,10 @@ IPA.idrange.entity = function(spec) {
}
],
policies: [
- IPA.multiple_choice_section_policy({
+ {
+ $factory: IPA.multiple_choice_section_policy,
widget: 'type'
- })
+ }
]
});
};
diff --git a/install/ui/src/freeipa/service.js b/install/ui/src/freeipa/service.js
index 5dc69aaa9..22a88dfba 100644
--- a/install/ui/src/freeipa/service.js
+++ b/install/ui/src/freeipa/service.js
@@ -37,18 +37,20 @@ IPA.service.entity = function(spec) {
spec = spec || {};
spec.policies = spec.policies || [
- IPA.search_facet_update_policy(),
- IPA.details_facet_update_policy(),
- IPA.cert.cert_update_policy({
+ IPA.search_facet_update_policy,
+ IPA.details_facet_update_policy,
+ {
+ $factory: IPA.cert.cert_update_policy,
source_facet: 'details',
dest_entity: 'cert',
dest_facet: 'details'
- }),
- IPA.cert.cert_update_policy({
+ },
+ {
+ $factory: IPA.cert.cert_update_policy,
source_facet: 'details',
dest_entity: 'cert',
dest_facet: 'search'
- })
+ }
];
var that = IPA.entity(spec);
@@ -164,7 +166,7 @@ IPA.service.entity = function(spec) {
]
},
policies: [
- IPA.service.certificate_policy()
+ IPA.service.certificate_policy
]
}).
association_facet({
diff --git a/install/ui/src/freeipa/trust.js b/install/ui/src/freeipa/trust.js
index 31dbbb9b9..bb442b010 100644
--- a/install/ui/src/freeipa/trust.js
+++ b/install/ui/src/freeipa/trust.js
@@ -174,9 +174,10 @@ IPA.trust.entity = function(spec) {
}
],
policies: [
- IPA.multiple_choice_section_policy({
+ {
+ $factory: IPA.multiple_choice_section_policy,
widget: 'method'
- })
+ }
]
});
};
diff --git a/install/ui/test/aci_tests.js b/install/ui/test/aci_tests.js
index 5c8b37e0f..a98c45a1d 100644
--- a/install/ui/test/aci_tests.js
+++ b/install/ui/test/aci_tests.js
@@ -115,7 +115,10 @@ module('aci', {
}
],
policies: [
- IPA.permission_target_policy('target')
+ {
+ $factory: IPA.permission_target_policy,
+ widget_name: 'target'
+ }
]
});
entity.add_facet('details', target_facet);
generated by cgit (git 2.34.1) at 2024-06-23 07:22:06 +0000