On 06/09/2016 02:19 PM, Alexander Bokovoy wrote:
On Thu, 09 Jun 2016, Sumit Bose wrote:
On Thu, Jun 09, 2016 at 02:30:52PM +0300, Alexander Bokovoy wrote:
Hi,

webUI changes to support external trust and showing UPN suffixes are
attached.

UPN Suffixes defined on AD side and fetched with 'ipa trust-fetch-domains'.
They cannot be disabled individually as they come from AD side and are
forest-wide, so we only show them, not allowing to modify anything.

External forest is a flag and is shown in the trust-add dialog.
The result would be visible as trust type of 'Non-transitive external
trust to a domain in another Active Directory forest'

These patches functionally depend on 0201 and 0202.

--
/ Alexander Bokovoy

From 4da33f5e82c83617ccfb2da7c3b70e5e66ac49d9 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <aboko...@redhat.com>
Date: Thu, 9 Jun 2016 12:04:05 +0300
Subject: [PATCH 7/8] webui: show UPN suffixes in trust properties

Part of https://fedorahosted.org/freeipa/ticket/5354

---
 install/ui/src/freeipa/trust.js | 11 +++++++++++
 ipaserver/plugins/internal.py   |  2 ++
 2 files changed, 13 insertions(+)

...
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index 4804f64..ea29b16 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -747,6 +747,8 @@ class i18n_messages(Command):
                 "trustdirection": _("Trust direction"),
                 "truststatus": _("Trust status"),
                 "trusttype": _("Trust type"),
+                "suffixes": _("UPN suffixes"),
+                "ipantadditionalsuffixes": _("UPN suffixes"),

The AD gui calls the latter 'Alternative UPN suffixes'. Maybe we should
use the same description here as well to avoid irritations?
Makes sense. I've updated the patch 0208 and also removed the string
'suffixes' which is not referenced from the UI.


Hello,

thank you for patches, they look good and work well. I have only one small comment:
Patch 208:

+                            read_only: 'true'

It would be nicer to use boolean value instead of string, even if it works correctly with string value.

And because it is really small change I edited your patch. I also changed links in your commit messages to WebUI tickets (5904,5937). Edited patches are attached, so ACK if you agree with these changes.

--
Pavel^3 Vomacka
From 647e44943e9aa456ae82c460ed808745c6bef6ba Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <aboko...@redhat.com>
Date: Thu, 9 Jun 2016 12:04:05 +0300
Subject: [PATCH 1/2] webui: show UPN suffixes in trust properties

https://fedorahosted.org/freeipa/ticket/5937
---
 install/ui/src/freeipa/trust.js | 13 ++++++++++++-
 ipaserver/plugins/internal.py   |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/install/ui/src/freeipa/trust.js b/install/ui/src/freeipa/trust.js
index f26e2f21b7c8a97536a0a5cb23484da4173d6463..fde7ff20768921c7425155bf31211f6903f13834 100644
--- a/install/ui/src/freeipa/trust.js
+++ b/install/ui/src/freeipa/trust.js
@@ -142,6 +142,17 @@ return {
                     ]
                 },
                 {
+                    name: 'suffixes',
+                    label: '@i18n:objects.trust.ipantadditionalsuffixes',
+                    fields: [
+                        {
+                            $type: 'multivalued',
+                            name: 'ipantadditionalsuffixes',
+                            read_only: true
+                        },
+                    ]
+                },
+                {
                     name: 'blacklists',
                     label: '@i18n:objects.trust.blacklists',
                     fields: [
@@ -446,4 +457,4 @@ phases.on('registration', IPA.trust.register);
 phases.on('profile', exp.remove_menu_item, 20);
 
 return exp;
-});
\ No newline at end of file
+});
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index 4804f64a0191a8f00f613fbc4d7fd86d7c73775f..c44c260f542428a76ff81c7119efefef4b5da492 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -747,6 +747,7 @@ class i18n_messages(Command):
                 "trustdirection": _("Trust direction"),
                 "truststatus": _("Trust status"),
                 "trusttype": _("Trust type"),
+                "ipantadditionalsuffixes": _("Alternative UPN suffixes"),
             },
             "trustconfig": {
                 "options": _("Options"),
-- 
2.5.5

From c86a13ba790dacfa0e2514f98fdc5f4e89a9e4de Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <aboko...@redhat.com>
Date: Thu, 9 Jun 2016 12:04:39 +0300
Subject: [PATCH 2/2] webui: support external flag to trust-add

https://fedorahosted.org/freeipa/ticket/5904
---
 install/ui/src/freeipa/trust.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/install/ui/src/freeipa/trust.js b/install/ui/src/freeipa/trust.js
index fde7ff20768921c7425155bf31211f6903f13834..d1bc0dec999186b9ca03a1fd87a69ae7dfb9e2e1 100644
--- a/install/ui/src/freeipa/trust.js
+++ b/install/ui/src/freeipa/trust.js
@@ -189,6 +189,12 @@ return {
                 widget: 'realm.bidirectional'
             },
             {
+                $type: 'checkbox',
+                name: 'external',
+                metadata: '@mc-opt:trust_add:external',
+                widget: 'realm.external'
+            },
+            {
                 name: 'realm_admin',
                 label: '@i18n:objects.trust.account',
                 widget: 'method.realm_admin'
@@ -246,6 +252,11 @@ return {
                         $type: 'checkbox',
                         name: 'bidirectional',
                         tooltip: '@mc-opt:trust_add:bidirectional:doc'
+                    },
+                    {
+                        $type: 'checkbox',
+                        name: 'external',
+                        tooltip: '@mc-opt:trust_add:external:doc'
                     }
                 ]
             },
-- 
2.5.5

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Reply via email to