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.
--
/ Alexander Bokovoy
From 51b9d21b1ebefaa70d37b4bb3e2171c326897f47 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   |  1 +
 2 files changed, 12 insertions(+)

diff --git a/install/ui/src/freeipa/trust.js b/install/ui/src/freeipa/trust.js
index f26e2f2..f147a26 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: [
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index 4804f64..c44c260 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.7.4

-- 
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