From 414e59e900d06a937bb139846d37cc3c9c71f767 Mon Sep 17 00:00:00 2001 From: Petr Vobornik Date: Aug 22 2013 13:21:20 +0000 Subject: Add base-id, range-size and range-type options to trust-add dialog https://fedorahosted.org/freeipa/ticket/3049 --- diff --git a/install/ui/src/freeipa/trust.js b/install/ui/src/freeipa/trust.js index 5f3458d..53a5367 100644 --- a/install/ui/src/freeipa/trust.js +++ b/install/ui/src/freeipa/trust.js @@ -130,7 +130,26 @@ return { $type: 'same_password', other_field: 'trust_secret' }] + }, + { + $type: 'radio', + name: 'range_type', + metadata: '@mc-opt:trust_add:range_type', + widget: 'range.range_type' + }, + { + name: 'base_id', + label: '@i18n:objects.idrange.ipabaseid', + metadata: '@mc-opt:trust_add:base_id', + widget: 'range.base_id' + }, + { + name: 'range_size', + label: '@i18n:objects.idrange.ipaidrangesize', + metadata: '@mc-opt:trust_add:range_size', + widget: 'range.range_size' } + ], widgets: [ { @@ -176,6 +195,34 @@ return { name: 'trust_secret_verify' } ] + }, + { + $type: 'details_table_section_nc', + name: 'range', + widgets: [ + { + $type: 'radio', + name: 'range_type', + layout: 'vertical', + default_value: '', + options: [ + { + value: '', + label: '@i18n:objects.idrange.type_detect' + }, + { + value: 'ipa-ad-trust', + label: '@i18n:objects.idrange.type_ad' + }, + { + value: 'ipa-ad-trust-posix', + label: '@i18n:objects.idrange.type_ad_posix' + } + ] + }, + 'base_id', + 'range_size' + ] } ], policies: [ diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index 9cc7d23..8e0b2a3 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -382,6 +382,7 @@ "type": "Range type", "type_ad": "Active Directory domain", "type_ad_posix": "Active Directory domain with POSIX attributes", + "type_detect": "Detect", "type_local": "Local domain", "type_ipa": "IPA trust", "type_winsync": "Active Directory winsync" diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py index b837412..83b505d 100644 --- a/ipalib/plugins/internal.py +++ b/ipalib/plugins/internal.py @@ -517,6 +517,7 @@ class i18n_messages(Command): "type": _("Range type"), "type_ad": _("Active Directory domain"), "type_ad_posix": _("Active Directory domain with POSIX attributes"), + "type_detect": _("Detect"), "type_local": _("Local domain"), "type_ipa": _("IPA trust"), "type_winsync": _("Active Directory winsync"),