diff options
author | Ana Krivokapic <akrivoka@redhat.com> | 2013-04-09 12:46:01 +0200 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2013-04-12 14:07:55 -0400 |
commit | 39982f6696267706b70f598ee80ce87924cc34a4 (patch) | |
tree | 56fd6e65aafebc4f196ba3e01a7259abab41fc88 | |
parent | 583bf43367769ca84ebc16594f8b70287b502311 (diff) | |
download | freeipa-39982f6696267706b70f598ee80ce87924cc34a4.tar.gz freeipa-39982f6696267706b70f598ee80ce87924cc34a4.tar.xz freeipa-39982f6696267706b70f598ee80ce87924cc34a4.zip |
Remove HBAC source hosts from web UI
https://fedorahosted.org/freeipa/ticket/3528
-rw-r--r-- | install/ui/src/freeipa/hbac.js | 67 | ||||
-rw-r--r-- | install/ui/src/freeipa/hbactest.js | 24 | ||||
-rw-r--r-- | ipalib/plugins/internal.py | 3 |
3 files changed, 0 insertions, 94 deletions
diff --git a/install/ui/src/freeipa/hbac.js b/install/ui/src/freeipa/hbac.js index 5bf844469..b508fe7c4 100644 --- a/install/ui/src/freeipa/hbac.js +++ b/install/ui/src/freeipa/hbac.js @@ -465,73 +465,6 @@ IPA.hbacrule_details_facet = function(spec) { } ); - // - // Source host - // - - spec.fields.push( - { - type: 'radio', - name: 'sourcehostcategory', - widget: 'sourcehost.rule.sourcehostcategory' - }, - { - type: 'rule_association_table', - name: 'sourcehost_host', - widget: 'sourcehost.rule.sourcehost_host', - priority: IPA.hbac.remove_method_priority - }, - { - type: 'rule_association_table', - name: 'sourcehost_hostgroup', - widget: 'sourcehost.rule.sourcehost_hostgroup', - priority: IPA.hbac.remove_method_priority - } - ); - - spec.widgets.push( - { - factory: IPA.collapsible_section, - name: 'sourcehost', - label: IPA.messages.objects.hbacrule.sourcehost, - widgets: [ - { - factory: IPA.rule_details_widget, - name: 'rule', - radio_name: 'sourcehostcategory', - options: [ - { 'value': 'all', 'label': IPA.messages.objects.hbacrule.any_host }, - { 'value': '', 'label': IPA.messages.objects.hbacrule.specified_hosts } - ], - tables: [ - { 'name': 'sourcehost_host' }, - { 'name': 'sourcehost_hostgroup' } - ], - widgets: [ - { - type: 'rule_association_table', - id: entity_name+'-memberuser_user', - name: 'sourcehost_host', - add_method: 'add_sourcehost', - remove_method: 'remove_sourcehost', - add_title: IPA.messages.association.add.sourcehost, - remove_title: IPA.messages.association.remove.sourcehost - }, - { - type: 'rule_association_table', - id: entity_name+'-memberuser_group', - name: 'sourcehost_hostgroup', - add_method: 'add_sourcehost', - remove_method: 'remove_sourcehost', - add_title: IPA.messages.association.add.sourcehost, - remove_title: IPA.messages.association.remove.sourcehost - } - ] - } - ] - } - ); - var that = IPA.details_facet(spec); that.update_on_success = function(data, text_status, xhr) { diff --git a/install/ui/src/freeipa/hbactest.js b/install/ui/src/freeipa/hbactest.js index 1fa88fca4..cf3617807 100644 --- a/install/ui/src/freeipa/hbactest.js +++ b/install/ui/src/freeipa/hbactest.js @@ -86,23 +86,6 @@ IPA.hbac.test_entity = function(spec) { ] }). facet({ - factory: IPA.hbac.test_select_facet, - name: 'sourcehost', - label: IPA.messages.objects.hbacrule.sourcehost, - managed_entity: 'host', - disable_breadcrumb: true, - facet_group: 'default', - columns: [ - 'fqdn', - 'description', - { - name: 'has_keytab', - label: IPA.messages.objects.host.enrolled, - formatter: IPA.boolean_formatter() - } - ] - }). - facet({ factory: IPA.hbac.test_rules_facet, name: 'rules', label: IPA.messages.objects.hbactest.rules, @@ -645,9 +628,6 @@ IPA.hbac.test_run_facet = function(spec) { facet = that.entity.get_facet('service'); facet.reset(); - facet = that.entity.get_facet('sourcehost'); - facet.reset(); - facet = that.entity.get_facet('rules'); facet.reset(); @@ -704,10 +684,6 @@ IPA.hbac.test_run_facet = function(spec) { facet.save(options); that.validate_facet(facet, options, validation_results); - facet = that.entity.get_facet('sourcehost'); - facet.save(options); - that.validate_facet(facet, options, validation_results); - if (!validation_results.valid) { var dialog = IPA.hbac.validation_dialog({ validation_results: validation_results diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py index f234f66a1..d50ffb543 100644 --- a/ipalib/plugins/internal.py +++ b/ipalib/plugins/internal.py @@ -164,7 +164,6 @@ class i18n_messages(Command): "memberallowcmd": _("Add Allow ${other_entity} into ${entity} ${primary_key}"), "memberdenycmd": _("Add Deny ${other_entity} into ${entity} ${primary_key}"), "memberof": _("Add ${entity} ${primary_key} into ${other_entity}"), - "sourcehost": _("Add Source ${other_entity} into ${entity} ${primary_key}"), }, "added": _("Items added"), "direct_membership": _("Direct Membership"), @@ -179,7 +178,6 @@ class i18n_messages(Command): "memberallowcmd": _("Remove Allow ${other_entity} from ${entity} ${primary_key}"), "memberdenycmd": _("Remove Deny ${other_entity} from ${entity} ${primary_key}"), "memberof": _("Remove ${entity} ${primary_key} from ${other_entity}"), - "sourcehost": _("Remove Source ${other_entity} from ${entity} ${primary_key}"), }, "removed": _("Items removed"), "show_results": _("Show Results"), @@ -449,7 +447,6 @@ class i18n_messages(Command): "host": _("Accessing"), "ipaenabledflag": _("Rule status"), "service": _("Via Service"), - "sourcehost": _("From"), "specified_hosts": _("Specified Hosts and Groups"), "specified_services": _("Specified Services and Groups"), "specified_users": _("Specified Users and Groups"), |