On 08/15/2013 12:33 PM, Petr Vobornik wrote:
https://fedorahosted.org/freeipa/ticket/3049
New version.
This version adds option for range type auto-detection. Previous patch
forced some range type.
--
Petr Vobornik
From 2e8b9c4d7932684bd389f776c534ac2f10b0fa41 Mon Sep 17 00:00:00 2001
From: Petr Vobornik <[email protected]>
Date: Thu, 15 Aug 2013 12:31:32 +0200
Subject: [PATCH] Add base-id, range-size and range-type options to trust-add
dialog
https://fedorahosted.org/freeipa/ticket/3049
---
install/ui/src/freeipa/trust.js | 47 ++++++++++++++++++++++++++++++++++++++
install/ui/test/data/ipa_init.json | 1 +
ipalib/plugins/internal.py | 1 +
3 files changed, 49 insertions(+)
diff --git a/install/ui/src/freeipa/trust.js b/install/ui/src/freeipa/trust.js
index 5f3458d29f37bdd13435e7ed494774b1333ea07e..53a536763a7e640c2248322c455481c2b137a05d 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 9cc7d23f7d25827bdccba0cb89524964720d1dab..8e0b2a33cc45d2a68878b7f3ab49b1491ae7c3f5 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 b837412c78630dbb81a632850050d09e0ab0d029..83b505dae1c6349097f7ad5ed20ab25b5a262aa8 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"),
--
1.8.3.1
_______________________________________________
Freeipa-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/freeipa-devel
