From 6a034abf953ab756c69de5ec7a838d259d229bea Mon Sep 17 00:00:00 2001 From: Petr Vobornik Date: Thu, 11 Apr 2013 13:07:53 +0200 Subject: Rename factory to $factory in spec objects https://fedorahosted.org/freeipa/ticket/3235 --- install/ui/src/freeipa/aci.js | 2 +- install/ui/src/freeipa/association.js | 2 +- install/ui/src/freeipa/automember.js | 16 ++++++++-------- install/ui/src/freeipa/automount.js | 8 ++++---- install/ui/src/freeipa/certificate.js | 10 +++++----- install/ui/src/freeipa/details.js | 2 +- install/ui/src/freeipa/dns.js | 22 +++++++++++----------- install/ui/src/freeipa/entitle.js | 16 ++++++++-------- install/ui/src/freeipa/entity.js | 2 +- install/ui/src/freeipa/facet.js | 20 ++++++++++---------- install/ui/src/freeipa/group.js | 2 +- install/ui/src/freeipa/hbac.js | 16 ++++++++-------- install/ui/src/freeipa/hbactest.js | 8 ++++---- install/ui/src/freeipa/host.js | 18 +++++++++--------- install/ui/src/freeipa/ipa.js | 2 +- install/ui/src/freeipa/netgroup.js | 10 +++++----- install/ui/src/freeipa/realmdomains.js | 2 +- install/ui/src/freeipa/selinux.js | 12 ++++++------ install/ui/src/freeipa/service.js | 10 +++++----- install/ui/src/freeipa/sudo.js | 28 ++++++++++++++-------------- install/ui/src/freeipa/trust.js | 2 +- install/ui/src/freeipa/user.js | 14 +++++++------- install/ui/src/freeipa/widget.js | 4 ++-- 23 files changed, 114 insertions(+), 114 deletions(-) diff --git a/install/ui/src/freeipa/aci.js b/install/ui/src/freeipa/aci.js index 3165cdddf..2b613b1bd 100644 --- a/install/ui/src/freeipa/aci.js +++ b/install/ui/src/freeipa/aci.js @@ -36,7 +36,7 @@ IPA.aci.permission_entity = function(spec) { columns: [ 'cn' ] }). details_facet({ - factory: IPA.aci.permission_details_facet, + $factory: IPA.aci.permission_details_facet, fields: [ { name:'cn', diff --git a/install/ui/src/freeipa/association.js b/install/ui/src/freeipa/association.js index 8e70b68ef..8cbdc63af 100644 --- a/install/ui/src/freeipa/association.js +++ b/install/ui/src/freeipa/association.js @@ -1189,7 +1189,7 @@ IPA.attribute_facet = function(spec, no_init) { IPA.selected_state_evaluator, IPA.read_only_state_evaluator, { - factory: IPA.attr_read_only_evaluator, + $factory: IPA.attr_read_only_evaluator, attribute: spec.attribute }); diff --git a/install/ui/src/freeipa/automember.js b/install/ui/src/freeipa/automember.js index 15649cf39..a2ac8365c 100644 --- a/install/ui/src/freeipa/automember.js +++ b/install/ui/src/freeipa/automember.js @@ -52,7 +52,7 @@ IPA.automember.entity = function(spec) { that.entity_init(); that.builder.search_facet({ - factory: IPA.automember.rule_search_facet, + $factory: IPA.automember.rule_search_facet, name: 'searchgroup', group_type: 'group', label: '@i18n:objects.automember.usergrouprules', @@ -64,7 +64,7 @@ IPA.automember.entity = function(spec) { ] }). search_facet({ - factory: IPA.automember.rule_search_facet, + $factory: IPA.automember.rule_search_facet, name: 'searchhostgroup', group_type: 'hostgroup', label: '@i18n:objects.automember.hostgrouprules', @@ -76,7 +76,7 @@ IPA.automember.entity = function(spec) { ] }). details_facet({ - factory: IPA.automember.rule_details_facet, + $factory: IPA.automember.rule_details_facet, name: 'usergrouprule', group_type: 'group', label: '@i18n:objects.automember.usergrouprule', @@ -85,7 +85,7 @@ IPA.automember.entity = function(spec) { redirect_info: { facet: 'searchgroup' } }). details_facet({ - factory: IPA.automember.rule_details_facet, + $factory: IPA.automember.rule_details_facet, name: 'hostgrouprule', group_type: 'hostgroup', label: '@i18n:objects.automember.hostgrouprule', @@ -94,7 +94,7 @@ IPA.automember.entity = function(spec) { redirect_info: { facet: 'searchhostgroup' } }). adder_dialog({ - factory: IPA.automember.rule_adder_dialog, + $factory: IPA.automember.rule_adder_dialog, title: '@i18n:objects.automember.add_rule', fields: [ { @@ -107,7 +107,7 @@ IPA.automember.entity = function(spec) { height: '300' }). deleter_dialog({ - factory: IPA.automember.rule_deleter_dialog + $factory: IPA.automember.rule_deleter_dialog }); }; @@ -251,7 +251,7 @@ IPA.automember.rule_details_facet = function(spec) { ] }, { - factory: IPA.collapsible_section, + $factory: IPA.collapsible_section, name: 'inclusive', label: '@i18n:objects.automember.inclusive', widgets: [ @@ -280,7 +280,7 @@ IPA.automember.rule_details_facet = function(spec) { ] }, { - factory: IPA.collapsible_section, + $factory: IPA.collapsible_section, name: 'exclusive', label: '@i18n:objects.automember.exclusive', widgets: [ diff --git a/install/ui/src/freeipa/automount.js b/install/ui/src/freeipa/automount.js index bc3e06ef5..ab8ac791f 100644 --- a/install/ui/src/freeipa/automount.js +++ b/install/ui/src/freeipa/automount.js @@ -70,7 +70,7 @@ IPA.automount.map_entity = function(spec) { that.builder.containing_entity('automountlocation'). facet_groups([ 'automountkey', 'settings' ]). nested_search_facet({ - factory: IPA.automount.key_search_facet, + $factory: IPA.automount.key_search_facet, facet_group: 'automountkey', nested_entity: 'automountkey', search_all_entries: true, @@ -79,7 +79,7 @@ IPA.automount.map_entity = function(spec) { name: 'keys', columns: [ { - factory: IPA.automount_key_column, + $factory: IPA.automount_key_column, name: 'automountkey', label: IPA.get_entity_param('automountkey', 'automountkey').label }, @@ -102,7 +102,7 @@ IPA.automount.map_entity = function(spec) { ] }). adder_dialog({ - factory: IPA.automountmap_adder_dialog, + $factory: IPA.automountmap_adder_dialog, sections: [ { name: 'general', @@ -171,7 +171,7 @@ IPA.automount.key_entity = function(spec) { that.builder.containing_entity('automountmap'). details_facet({ - factory: IPA.automount.key_details_facet, + $factory: IPA.automount.key_details_facet, sections: [ { name:'identity', diff --git a/install/ui/src/freeipa/certificate.js b/install/ui/src/freeipa/certificate.js index 1478a5473..442e1824b 100755 --- a/install/ui/src/freeipa/certificate.js +++ b/install/ui/src/freeipa/certificate.js @@ -478,7 +478,7 @@ IPA.cert.load_policy = function(spec) { spec = spec || {}; spec.loader = spec.loader || { - factory: IPA.cert.loader, + $factory: IPA.cert.loader, get_pkey: spec.get_pkey, get_name: spec.get_name, get_principal: spec.get_principal, @@ -719,7 +719,7 @@ IPA.cert.restore_action = function(spec) { spec.hide_cond = spec.hide_cond || ['ra_disabled']; spec.confirm_msg = spec.confirm_msg || '@i18n:objects.cert.restore_confirmation'; spec.confirm_dialog = spec.confirm_dialog || { - factory: IPA.confirm_dialog, + $factory: IPA.confirm_dialog, ok_label: '@i18n:buttons.restore' }; spec.needs_confirm = spec.needs_confirm !== undefined ? spec.needs_confirm : true; @@ -1054,7 +1054,7 @@ IPA.cert.entity = function(spec) { that.entity_init(); that.builder.search_facet({ - factory: IPA.cert.search_facet, + $factory: IPA.cert.search_facet, pagination: false, no_update: true, columns: [ @@ -1121,7 +1121,7 @@ IPA.cert.entity = function(spec) { ] }). details_facet({ - factory: IPA.cert.details_facet, + $factory: IPA.cert.details_facet, no_update: true, actions: [ IPA.cert.revoke_action, @@ -1137,7 +1137,7 @@ IPA.cert.entity = function(spec) { name: 'details', label: '@i18n:objects.cert.certificate', action_panel: { - factory: IPA.action_panel, + $factory: IPA.action_panel, name: 'cert_actions', actions: [ 'revoke_cert', 'restore_cert' diff --git a/install/ui/src/freeipa/details.js b/install/ui/src/freeipa/details.js index cb42ad4c2..19dfa1b67 100644 --- a/install/ui/src/freeipa/details.js +++ b/install/ui/src/freeipa/details.js @@ -912,7 +912,7 @@ exp.boolean_state_evaluator = IPA.boolean_state_evaluator = function(spec) { that.false_state = spec.false_state || that.field_name + '-false'; that.invert_value = spec.invert_value; that.parser = IPA.build({ - factory: spec.parser || IPA.boolean_formatter, + $factory: spec.parser || IPA.boolean_formatter, invert_value: that.invert_value }); diff --git a/install/ui/src/freeipa/dns.js b/install/ui/src/freeipa/dns.js index f9278a166..4c135ff6e 100644 --- a/install/ui/src/freeipa/dns.js +++ b/install/ui/src/freeipa/dns.js @@ -145,7 +145,7 @@ IPA.dns.zone_entity = function(spec) { ] }). details_facet({ - factory: IPA.dnszone_details_facet, + $factory: IPA.dnszone_details_facet, command_mode: 'info', sections: [ { @@ -242,11 +242,11 @@ IPA.dns.zone_entity = function(spec) { state: { evaluators: [ { - factory: IPA.enable_state_evaluator, + $factory: IPA.enable_state_evaluator, field: 'idnszoneactive' }, { - factory: IPA.acl_state_evaluator, + $factory: IPA.acl_state_evaluator, attribute: 'managedby' }, IPA.dns.zone_has_permission_evaluator @@ -258,7 +258,7 @@ IPA.dns.zone_entity = function(spec) { } }). nested_search_facet({ - factory: IPA.dns.record_search_facet, + $factory: IPA.dns.record_search_facet, facet_group: 'dnsrecord', nested_entity : 'dnsrecord', name: 'records', @@ -284,11 +284,11 @@ IPA.dns.zone_entity = function(spec) { }). standard_association_facets(). adder_dialog({ - factory: IPA.dnszone_adder_dialog, + $factory: IPA.dnszone_adder_dialog, height: 300, sections: [ { - factory: IPA.dnszone_name_section, + $factory: IPA.dnszone_name_section, name: 'name', fields: [ { @@ -804,7 +804,7 @@ IPA.dns.get_record_metadata = function() { ], columns: [ { - factory: IPA.dns.ptr_redirection_column, + $factory: IPA.dns.ptr_redirection_column, name: 'a_part_ip_address' } ] @@ -823,7 +823,7 @@ IPA.dns.get_record_metadata = function() { ], columns: [ { - factory: IPA.dns.ptr_redirection_column, + $factory: IPA.dns.ptr_redirection_column, name: 'aaaa_part_ip_address' } ] @@ -1157,7 +1157,7 @@ IPA.dns.record_entity = function(spec) { that.builder.containing_entity('dnszone'). details_facet({ - factory: IPA.dns.record_details_facet, + $factory: IPA.dns.record_details_facet, disable_breadcrumb: false, fields: [ { @@ -1185,7 +1185,7 @@ IPA.dns.record_entity = function(spec) { ] }). adder_dialog({ - factory: IPA.dns.record_adder_dialog, + $factory: IPA.dns.record_adder_dialog, fields: [ { name: 'idnsname', @@ -1665,7 +1665,7 @@ IPA.dns.record_type_table_widget = function(spec) { spec.columns.push({ name: 'position', label: '', - factory: IPA.dns.record_modify_column, + $factory: IPA.dns.record_modify_column, width: '106px' }); diff --git a/install/ui/src/freeipa/entitle.js b/install/ui/src/freeipa/entitle.js index 6800eed6a..402c4cf69 100644 --- a/install/ui/src/freeipa/entitle.js +++ b/install/ui/src/freeipa/entitle.js @@ -40,7 +40,7 @@ IPA.entitle.entity = function(spec) { that.builder.facet_groups([ 'account', 'certificates' ]). details_facet({ - factory: IPA.entitle.details_facet, + $factory: IPA.entitle.details_facet, label: '@i18n:objects.entitle.account', facet_group: 'account', sections: [ @@ -54,7 +54,7 @@ IPA.entitle.entity = function(spec) { read_only: true }, { - factory: IPA.entitle.download_widget, + $factory: IPA.entitle.download_widget, name: 'certificate', label: '@i18n:objects.entitle.certificate' } @@ -84,7 +84,7 @@ IPA.entitle.entity = function(spec) { ] }). facet({ - factory: IPA.entitle.certificates_facet, + $factory: IPA.entitle.certificates_facet, name: 'certificates', label: '@i18n:objects.entitle.certificates', facet_group: 'certificates', @@ -106,7 +106,7 @@ IPA.entitle.entity = function(spec) { label: '@i18n:objects.entitle.end' }, { - factory: IPA.entitle.certificate_column, + $factory: IPA.entitle.certificate_column, name: 'certificate', label: '@i18n:objects.entitle.certificate' } @@ -114,7 +114,7 @@ IPA.entitle.entity = function(spec) { }). standard_association_facets(). dialog({ - factory: IPA.entitle.register_online_dialog, + $factory: IPA.entitle.register_online_dialog, name: 'online_registration', title: '@i18n:objects.entitle.registration', fields: [ @@ -136,7 +136,7 @@ IPA.entitle.entity = function(spec) { ] }). dialog({ - factory: IPA.entitle.register_offline_dialog, + $factory: IPA.entitle.register_offline_dialog, name: 'offline_registration', title: '@i18n:objects.entitle.import_certificate', message: '@i18n:objects.entitle.import_message', @@ -148,7 +148,7 @@ IPA.entitle.entity = function(spec) { ] }). dialog({ - factory: IPA.entitle.consume_dialog, + $factory: IPA.entitle.consume_dialog, name: 'consume', title: '@i18n:objects.entitle.consume_entitlement', fields: [ @@ -160,7 +160,7 @@ IPA.entitle.entity = function(spec) { ] }). dialog({ - factory: IPA.entitle.import_dialog, + $factory: IPA.entitle.import_dialog, name: 'import', title: '@i18n:objects.entitle.import_certificate', message: '@i18n:objects.entitle.import_message', diff --git a/install/ui/src/freeipa/entity.js b/install/ui/src/freeipa/entity.js index 27b56074d..8831fa70c 100644 --- a/install/ui/src/freeipa/entity.js +++ b/install/ui/src/freeipa/entity.js @@ -383,7 +383,7 @@ IPA.entity_builder = function() { } else { spec = { - factory: IPA.dialog, + $factory: IPA.dialog, name: spec, entity: entity }; diff --git a/install/ui/src/freeipa/facet.js b/install/ui/src/freeipa/facet.js index 17033f96c..6edae5d05 100644 --- a/install/ui/src/freeipa/facet.js +++ b/install/ui/src/freeipa/facet.js @@ -118,7 +118,7 @@ exp.facet = IPA.facet = function(spec, no_init) { that.disable_breadcrumb = spec.disable_breadcrumb; that.disable_facet_tabs = spec.disable_facet_tabs; - that.action_state = IPA.build(spec.state, {}, { factory: exp.state }); + that.action_state = IPA.build(spec.state, {}, { $factory: exp.state }); that.actions = exp.action_holder_builder.build({ actions: spec.actions }); that.header_actions = spec.header_actions; @@ -645,7 +645,7 @@ exp.facet = IPA.facet = function(spec, no_init) { on(that.state, 'set', that.on_state_set); var buttons_spec = { - factory: IPA.control_buttons_widget, + $factory: IPA.control_buttons_widget, name: 'control-buttons', 'class': 'control-buttons', buttons: spec.control_buttons @@ -689,7 +689,7 @@ exp.facet_header = IPA.facet_header = function(spec) { }); var widget = { - factory: IPA.action_list_widget, + $factory: IPA.action_list_widget, actions: that.facet.header_actions }; @@ -1553,7 +1553,7 @@ exp.facet_builder = IPA.facet_builder = function(entity) { spec.factory = spec.factory || IPA.attribute_facet; entity.policies.add_policy(IPA.build({ - factory: IPA.facet_update_policy, + $factory: IPA.facet_update_policy, source_facet: 'search', dest_facet: spec.name })); @@ -1595,7 +1595,7 @@ exp.facet_builder = IPA.facet_builder = function(entity) { } entity.policies.add_policy(IPA.build({ - factory: IPA.facet_update_policy, + $factory: IPA.facet_update_policy, source_facet: 'search', dest_facet: spec.name })); @@ -2423,23 +2423,23 @@ var FacetState = exp.FacetState = declare([Stateful, Evented], { }); exp.action_builder = IPA.action_builder = new Builder({ - factory: exp.action + $factory: exp.action }); exp.action_holder_builder = new Builder({ - factory: exp.action_holder + $factory: exp.action_holder }); exp.state_builder = IPA.state_builder = new Builder({ - factory: exp.state + $factory: exp.state }); exp.state_evaluator_builder = IPA.state_evaluator_builder = new Builder({ - factory: exp.state + $factory: exp.state }); exp.action_button_widget_builder = IPA.action_button_widget_builder = new Builder({ - factory: exp.action_button_widget + $factory: exp.action_button_widget }); return exp; diff --git a/install/ui/src/freeipa/group.js b/install/ui/src/freeipa/group.js index 8b69a9ebd..f3b17c4ca 100644 --- a/install/ui/src/freeipa/group.js +++ b/install/ui/src/freeipa/group.js @@ -140,7 +140,7 @@ IPA.group.entity = function(spec) { }). standard_association_facets(). adder_dialog({ - factory: IPA.group_adder_dialog, + $factory: IPA.group_adder_dialog, fields: [ 'cn', { diff --git a/install/ui/src/freeipa/hbac.js b/install/ui/src/freeipa/hbac.js index bff36c0c8..8cbbbe08e 100644 --- a/install/ui/src/freeipa/hbac.js +++ b/install/ui/src/freeipa/hbac.js @@ -64,7 +64,7 @@ IPA.hbac.rule_entity = function(spec) { ] }). details_facet({ - factory: IPA.hbacrule_details_facet, + $factory: IPA.hbacrule_details_facet, entity: that, command_mode: 'info', actions: [ @@ -77,7 +77,7 @@ IPA.hbac.rule_entity = function(spec) { state: { evaluators: [ { - factory: IPA.enable_state_evaluator, + $factory: IPA.enable_state_evaluator, field: 'ipaenabledflag' } ], @@ -282,12 +282,12 @@ IPA.hbacrule_details_facet = function(spec) { spec.widgets.push( { - factory: IPA.collapsible_section, + $factory: IPA.collapsible_section, name: 'user', label: '@i18n:objects.hbacrule.user', widgets: [ { - factory: IPA.rule_details_widget, + $factory: IPA.rule_details_widget, name: 'rule', radio_name: 'usercategory', options: [ @@ -351,12 +351,12 @@ IPA.hbacrule_details_facet = function(spec) { spec.widgets.push( { - factory: IPA.collapsible_section, + $factory: IPA.collapsible_section, name: 'host', label: '@i18n:objects.hbacrule.host', widgets: [ { - factory: IPA.rule_details_widget, + $factory: IPA.rule_details_widget, name: 'rule', radio_name: 'hostcategory', options: [ @@ -424,12 +424,12 @@ IPA.hbacrule_details_facet = function(spec) { spec.widgets.push( { - factory: IPA.collapsible_section, + $factory: IPA.collapsible_section, name: 'service', label: '@i18n:objects.hbacrule.service', widgets: [ { - factory: IPA.rule_details_widget, + $factory: IPA.rule_details_widget, name: 'rule', radio_name: 'servicecategory', options: [ diff --git a/install/ui/src/freeipa/hbactest.js b/install/ui/src/freeipa/hbactest.js index 09d8b627b..3b0796056 100644 --- a/install/ui/src/freeipa/hbactest.js +++ b/install/ui/src/freeipa/hbactest.js @@ -36,7 +36,7 @@ IPA.hbac.test_entity = function(spec) { that.builder.facet_groups([ 'default' ]). facet({ - factory: IPA.hbac.test_select_facet, + $factory: IPA.hbac.test_select_facet, name: 'user', label: '@i18n:objects.hbacrule.user', managed_entity: 'user', @@ -57,7 +57,7 @@ IPA.hbac.test_entity = function(spec) { ] }). facet({ - factory: IPA.hbac.test_select_facet, + $factory: IPA.hbac.test_select_facet, name: 'targethost', label: '@i18n:objects.hbacrule.host', managed_entity: 'host', @@ -74,7 +74,7 @@ IPA.hbac.test_entity = function(spec) { ] }). facet({ - factory: IPA.hbac.test_select_facet, + $factory: IPA.hbac.test_select_facet, name: 'service', label: '@i18n:objects.hbacrule.service', managed_entity: 'hbacsvc', @@ -104,7 +104,7 @@ IPA.hbac.test_entity = function(spec) { ] }). facet({ - factory: IPA.hbac.test_run_facet, + $factory: IPA.hbac.test_run_facet, name: 'run_test', label: '@i18n:objects.hbactest.run_test', managed_entity: 'hbacrule', diff --git a/install/ui/src/freeipa/host.js b/install/ui/src/freeipa/host.js index b42b4e5b7..c3fee99ac 100644 --- a/install/ui/src/freeipa/host.js +++ b/install/ui/src/freeipa/host.js @@ -60,7 +60,7 @@ IPA.host.entity = function(spec) { ] }). details_facet({ - factory: IPA.host.details_facet, + $factory: IPA.host.details_facet, sections: [ { name: 'details', @@ -99,13 +99,13 @@ IPA.host.entity = function(spec) { { name: 'enrollment', action_panel: { - factory: IPA.action_panel, + $factory: IPA.action_panel, name: 'enrollment_actions', actions: ['unprovision', 'set_otp', 'reset_otp'] }, fields: [ { - factory: IPA.host_keytab_widget, + $factory: IPA.host_keytab_widget, name: 'has_keytab', label: '@i18n:objects.host.keytab' }, @@ -119,7 +119,7 @@ IPA.host.entity = function(spec) { { name: 'certificate', action_panel: { - factory: IPA.action_panel, + $factory: IPA.action_panel, name: 'cert_actions', actions: [ 'request_cert', 'view_cert', 'get_cert', @@ -138,14 +138,14 @@ IPA.host.entity = function(spec) { actions: [ IPA.host.unprovision_action, { - factory: IPA.host.set_otp_action, + $factory: IPA.host.set_otp_action, name: 'set_otp', label: '@i18n:objects.host.password_set_title', status: 'missing', hide_cond: ['has_password'] }, { - factory: IPA.host.set_otp_action, + $factory: IPA.host.set_otp_action, name: 'reset_otp', label: '@i18n:objects.host.password_reset_title', status: 'present', @@ -202,11 +202,11 @@ IPA.host.entity = function(spec) { }). standard_association_facets(). adder_dialog({ - factory: IPA.host_adder_dialog, + $factory: IPA.host_adder_dialog, height: 300, sections: [ { - factory: IPA.composite_widget, + $factory: IPA.composite_widget, name: 'fqdn', fields: [ { @@ -234,7 +234,7 @@ IPA.host.entity = function(spec) { ] }). deleter_dialog({ - factory: IPA.host_deleter_dialog + $factory: IPA.host_deleter_dialog }); }; diff --git a/install/ui/src/freeipa/ipa.js b/install/ui/src/freeipa/ipa.js index 913c223a2..e252a782d 100644 --- a/install/ui/src/freeipa/ipa.js +++ b/install/ui/src/freeipa/ipa.js @@ -232,7 +232,7 @@ var IPA = function() { var builder = IPA.entity_builder(); builder.entity({ - factory: factory, + $factory: factory, name: name }); diff --git a/install/ui/src/freeipa/netgroup.js b/install/ui/src/freeipa/netgroup.js index 81ef9ed48..4e4238fbf 100644 --- a/install/ui/src/freeipa/netgroup.js +++ b/install/ui/src/freeipa/netgroup.js @@ -41,7 +41,7 @@ IPA.netgroup.entity = function(spec) { ] }). details_facet({ - factory: IPA.netgroup.details_facet, + $factory: IPA.netgroup.details_facet, entity: that, command_mode: 'info' }). @@ -135,12 +135,12 @@ IPA.netgroup.details_facet = function(spec) { spec.widgets.push( { - factory: IPA.collapsible_section, + $factory: IPA.collapsible_section, name: 'user', label: '@i18n:objects.netgroup.user', widgets: [ { - factory: IPA.rule_details_widget, + $factory: IPA.rule_details_widget, name: 'rule', radio_name: 'usercategory', options: [ @@ -219,12 +219,12 @@ IPA.netgroup.details_facet = function(spec) { spec.widgets.push( { - factory: IPA.collapsible_section, + $factory: IPA.collapsible_section, name: 'host', label: '@i18n:objects.netgroup.host', widgets: [ { - factory: IPA.rule_details_widget, + $factory: IPA.rule_details_widget, name: 'rule', radio_name: 'hostcategory', options: [ diff --git a/install/ui/src/freeipa/realmdomains.js b/install/ui/src/freeipa/realmdomains.js index 645f444d1..f0188cd53 100644 --- a/install/ui/src/freeipa/realmdomains.js +++ b/install/ui/src/freeipa/realmdomains.js @@ -32,7 +32,7 @@ define(['./ipa', './jquery', './details', './entity'], function (IPA, $) { that.entity_init(); that.builder.details_facet({ - factory: IPA.realmdomains_details_facet, + $factory: IPA.realmdomains_details_facet, title: IPA.metadata.objects.realmdomains.label, sections: [ { diff --git a/install/ui/src/freeipa/selinux.js b/install/ui/src/freeipa/selinux.js index 8ce4a86a0..ee84c3548 100644 --- a/install/ui/src/freeipa/selinux.js +++ b/install/ui/src/freeipa/selinux.js @@ -63,7 +63,7 @@ IPA.selinux.selinuxusermap_entity = function(spec) { ] }). details_facet({ - factory: IPA.selinux_details_facet, + $factory: IPA.selinux_details_facet, entity: that, command_mode: 'info', actions: [ @@ -76,7 +76,7 @@ IPA.selinux.selinuxusermap_entity = function(spec) { state: { evaluators: [ { - factory: IPA.enable_state_evaluator, + $factory: IPA.enable_state_evaluator, field: 'ipaenabledflag' } ], @@ -180,12 +180,12 @@ IPA.selinux_details_facet = function(spec) { spec.widgets.push( { - factory: IPA.collapsible_section, + $factory: IPA.collapsible_section, name: 'user', label: '@i18n:objects.selinuxusermap.user', widgets: [ { - factory: IPA.rule_details_widget, + $factory: IPA.rule_details_widget, name: 'rule', radio_name: 'usercategory', options: [ @@ -249,12 +249,12 @@ IPA.selinux_details_facet = function(spec) { spec.widgets.push( { - factory: IPA.collapsible_section, + $factory: IPA.collapsible_section, name: 'host', label: '@i18n:objects.selinuxusermap.host', widgets: [ { - factory: IPA.rule_details_widget, + $factory: IPA.rule_details_widget, name: 'rule', radio_name: 'hostcategory', options: [ diff --git a/install/ui/src/freeipa/service.js b/install/ui/src/freeipa/service.js index a149c4063..4b4b1d0cc 100644 --- a/install/ui/src/freeipa/service.js +++ b/install/ui/src/freeipa/service.js @@ -51,7 +51,7 @@ IPA.service.entity = function(spec) { columns: [ 'krbprincipalname' ] }). details_facet({ - factory: IPA.service.details_facet, + $factory: IPA.service.details_facet, sections: [ { name: 'details', @@ -81,7 +81,7 @@ IPA.service.entity = function(spec) { { label: '@i18n:krbauthzdata.override', name: 'ipakrbauthzdata_override', - factory: IPA.option_widget_base, + $factory: IPA.option_widget_base, input_type: 'checkbox', value: 'NONE', combine_values: false, @@ -108,7 +108,7 @@ IPA.service.entity = function(spec) { { name: 'provisioning', action_panel: { - factory: IPA.action_panel, + $factory: IPA.action_panel, name: 'provisioning_actions', actions: ['unprovision'] }, @@ -123,7 +123,7 @@ IPA.service.entity = function(spec) { { name: 'certificate', action_panel: { - factory: IPA.action_panel, + $factory: IPA.action_panel, name: 'cert_actions', actions: [ 'request_cert', 'view_cert', 'get_cert', @@ -165,7 +165,7 @@ IPA.service.entity = function(spec) { }). standard_association_facets(). adder_dialog({ - factory: IPA.service_adder_dialog, + $factory: IPA.service_adder_dialog, height: 350, sections: [ { diff --git a/install/ui/src/freeipa/sudo.js b/install/ui/src/freeipa/sudo.js index 6a1f82511..e9cf6a607 100644 --- a/install/ui/src/freeipa/sudo.js +++ b/install/ui/src/freeipa/sudo.js @@ -62,7 +62,7 @@ IPA.sudo.rule_entity = function(spec) { ] }). details_facet({ - factory: IPA.sudorule_details_facet, + $factory: IPA.sudorule_details_facet, entity: that, command_mode: 'info', actions: [ @@ -75,7 +75,7 @@ IPA.sudo.rule_entity = function(spec) { state: { evaluators: [ { - factory: IPA.enable_state_evaluator, + $factory: IPA.enable_state_evaluator, field: 'ipaenabledflag' } ], @@ -267,7 +267,7 @@ IPA.sudorule_details_facet = function(spec) { spec.widgets.push( { - factory: IPA.sudo.options_section, + $factory: IPA.sudo.options_section, name: 'options', label: '@i18n:objects.sudorule.options', facet: that @@ -301,12 +301,12 @@ IPA.sudorule_details_facet = function(spec) { spec.widgets.push( { - factory: IPA.collapsible_section, + $factory: IPA.collapsible_section, name: 'user', label: '@i18n:objects.sudorule.user', widgets: [ { - factory: IPA.rule_details_widget, + $factory: IPA.rule_details_widget, name: 'rule', radio_name: 'usercategory', options: [ @@ -376,12 +376,12 @@ IPA.sudorule_details_facet = function(spec) { spec.widgets.push( { - factory: IPA.collapsible_section, + $factory: IPA.collapsible_section, name: 'host', label: '@i18n:objects.sudorule.host', widgets: [ { - factory: IPA.rule_details_widget, + $factory: IPA.rule_details_widget, name: 'rule', radio_name: 'hostcategory', options: [ @@ -462,18 +462,18 @@ IPA.sudorule_details_facet = function(spec) { spec.widgets.push( { - factory: IPA.collapsible_section, + $factory: IPA.collapsible_section, name: 'command', label: '@i18n:objects.sudorule.command', widgets: [ { - factory: IPA.header_widget, + $factory: IPA.header_widget, name: 'allow_header', text: '@i18n:objects.sudorule.allow', description: '@i18n:objects.sudorule.allow' }, { - factory: IPA.rule_details_widget, + $factory: IPA.rule_details_widget, name: 'rule', radio_name: 'cmdcategory', options: [ @@ -512,7 +512,7 @@ IPA.sudorule_details_facet = function(spec) { ] }, { - factory: IPA.header_widget, + $factory: IPA.header_widget, name: 'deny_header', text: '@i18n:objects.sudorule.deny', description: '@i18n:objects.sudorule.deny' @@ -578,12 +578,12 @@ IPA.sudorule_details_facet = function(spec) { spec.widgets.push( { - factory: IPA.collapsible_section, + $factory: IPA.collapsible_section, name: 'runas', label: '@i18n:objects.sudorule.runas', widgets: [ { - factory: IPA.rule_details_widget, + $factory: IPA.rule_details_widget, name: 'runas_users', radio_name: 'ipasudorunasusercategory', options: [ @@ -617,7 +617,7 @@ IPA.sudorule_details_facet = function(spec) { ] }, { - factory: IPA.rule_details_widget, + $factory: IPA.rule_details_widget, name: 'runas_groups', radio_name: 'ipasudorunasgroupcategory', options: [ diff --git a/install/ui/src/freeipa/trust.js b/install/ui/src/freeipa/trust.js index d69aa73da..e47b3b073 100644 --- a/install/ui/src/freeipa/trust.js +++ b/install/ui/src/freeipa/trust.js @@ -91,7 +91,7 @@ IPA.trust.entity = function(spec) { ] }). adder_dialog({ - factory: IPA.trust.adder_dialog, + $factory: IPA.trust.adder_dialog, fields: [ { name: 'cn', diff --git a/install/ui/src/freeipa/user.js b/install/ui/src/freeipa/user.js index a52515bea..f2de1ce42 100644 --- a/install/ui/src/freeipa/user.js +++ b/install/ui/src/freeipa/user.js @@ -56,11 +56,11 @@ IPA.user.entity = function(spec) { ], actions: [ { - factory: IPA.batch_disable_action, + $factory: IPA.batch_disable_action, hide_cond: ['self-service'] }, { - factory: IPA.batch_enable_action, + $factory: IPA.batch_enable_action, hide_cond: ['self-service'] } ], @@ -78,7 +78,7 @@ IPA.user.entity = function(spec) { ] }). details_facet({ - factory: IPA.user.details_facet, + $factory: IPA.user.details_facet, sections: [ { name: 'identity', @@ -96,14 +96,14 @@ IPA.user.entity = function(spec) { { name: 'account', action_panel: { - factory: IPA.action_panel, + $factory: IPA.action_panel, name: 'account_actions', actions: ['reset_password'] }, fields: [ 'uid', { - factory: IPA.user_password_widget, + $factory: IPA.user_password_widget, name: 'has_password', metadata: IPA.get_entity_param('user', 'userpassword') }, @@ -233,7 +233,7 @@ IPA.user.entity = function(spec) { state: { evaluators: [ { - factory: IPA.enable_state_evaluator, + $factory: IPA.enable_state_evaluator, field: 'nsaccountlock', invert_value: true }, @@ -283,7 +283,7 @@ IPA.user.entity = function(spec) { link: link }). adder_dialog({ - factory: IPA.user_adder_dialog, + $factory: IPA.user_adder_dialog, sections: [ { fields: [ diff --git a/install/ui/src/freeipa/widget.js b/install/ui/src/freeipa/widget.js index 0a8631e8e..88fd3e352 100644 --- a/install/ui/src/freeipa/widget.js +++ b/install/ui/src/freeipa/widget.js @@ -64,7 +64,7 @@ IPA.widget = function(spec) { if (typeof spec === 'function') { spec = { - factory: spec + $factory: spec }; } @@ -734,7 +734,7 @@ IPA.option_widget_base = function(spec, that) { var factory = option.factory || IPA.widget_factories[option.type]; if (typeof factory !== 'function') throw { error: 'Invalid factory', - factory: factory + $factory: factory }; option.nested = true; option.widget = factory(option); -- cgit