diff options
| author | Petr Vobornik <pvoborni@redhat.com> | 2013-03-22 17:54:12 +0100 |
|---|---|---|
| committer | Petr Vobornik <pvoborni@redhat.com> | 2013-03-29 17:12:25 +0100 |
| commit | 661f41e197779ac48e9f37f201080504962c8bed (patch) | |
| tree | e83f5092162668bafef42a8e70ca1c1712f13259 | |
| parent | 04325fbb4c64ee4aef6d8c9adf0ff95b8b653101 (diff) | |
| download | freeipa-661f41e197779ac48e9f37f201080504962c8bed.tar.gz freeipa-661f41e197779ac48e9f37f201080504962c8bed.tar.xz freeipa-661f41e197779ac48e9f37f201080504962c8bed.zip | |
Added Web UI support for service PAC type option: NONE
ipakrbauthzdata accepts [null, 'NONE', 'MS-PAC, 'PAD']
New nesting feature of radios/checkboxes was used to handle mutual exclusivity between
['MS-PAC', 'PAD'], 'NONE' and ''.
https://fedorahosted.org/freeipa/ticket/3404
| -rw-r--r-- | install/ui/src/freeipa/service.js | 30 | ||||
| -rw-r--r-- | install/ui/test/data/ipa_init.json | 6 | ||||
| -rw-r--r-- | ipalib/plugins/internal.py | 6 |
3 files changed, 39 insertions, 3 deletions
diff --git a/install/ui/src/freeipa/service.js b/install/ui/src/freeipa/service.js index c38cfef1b..62c025340 100644 --- a/install/ui/src/freeipa/service.js +++ b/install/ui/src/freeipa/service.js @@ -71,8 +71,32 @@ IPA.service.entity = function(spec) { }, { name: 'ipakrbauthzdata', - type: 'checkboxes', - options: IPA.create_options(['MS-PAC', 'PAD']) + type: 'radio', + layout: 'vertical', + options: [ + { + label: IPA.messages.krbauthzdata.inherited, + value: '' + }, + { + label: IPA.messages.krbauthzdata.override, + name: 'ipakrbauthzdata_override', + factory: IPA.option_widget_base, + input_type: 'checkbox', + value: 'NONE', + combine_values: false, + options: [ + { + label: IPA.messages.krbauthzdata.mspac, + value: 'MS-PAC' + }, + { + label: IPA.messages.krbauthzdata.pad, + value: 'PAD' + } + ] + } + ] } ] }, @@ -483,4 +507,4 @@ IPA.service.certificate_policy = function(spec) { IPA.register('service', IPA.service.entity); return {}; -});
\ No newline at end of file +}); diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index e563c0e5c..a75918eb2 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -131,6 +131,12 @@ "search": "Search" }, "false": "False", + "krbauthzdata": { + "inherited": "Inherited from server configuration", + "mspac": "MS-PAC", + "override": "Override inherited settings", + "pad": "PAD" + }, "login": { "form_auth": "To login with username and password, enter them in the fields below then click Login.", "header": "Logged In As", diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py index 85bf7d213..4cce2c607 100644 --- a/ipalib/plugins/internal.py +++ b/ipalib/plugins/internal.py @@ -266,6 +266,12 @@ class i18n_messages(Command): "search": _("Search"), }, "false": _("False"), + "krbauthzdata": { + "inherited": _("Inherited from server configuration"), + "mspac": _("MS-PAC"), + "override": _("Override inherited settings"), + "pad": _("PAD"), + }, "login": { "form_auth": _("To login with username and password, enter them in the fields below then click Login."), "header": _("Logged In As"), |