Hello,

please review attached patches. I moved strings used by authentication indicators widget to another dict so the second patch changes strings in custom_checkbox widget on service page.


https://fedorahosted.org/freeipa/ticket/5872

--
Pavel^3 Vomacka

From ead65516bc45ebb2432bc425e7a2485be6aa79f5 Mon Sep 17 00:00:00 2001
From: Pavel Vomacka <pvoma...@redhat.com>
Date: Tue, 28 Jun 2016 15:35:59 +0200
Subject: [PATCH 1/2] Add authentication identificator to host page

Also move strings which are connected with authentication indicators to authtype dict.
This place is more general than have them in service dict. It's nicer when these strings are
not used only on service page.

Part of: https://fedorahosted.org/freeipa/ticket/5872
---
 install/ui/src/freeipa/host.js     | 20 ++++++++++++++++++++
 install/ui/test/data/ipa_init.json |  6 +++---
 ipaserver/plugins/internal.py      |  6 +++---
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/install/ui/src/freeipa/host.js b/install/ui/src/freeipa/host.js
index 80e3db65844759cb195c56fe0b48a95bba78bd00..f8995ef28350b66e7164fd8e5d34c0bd80451113 100644
--- a/install/ui/src/freeipa/host.js
+++ b/install/ui/src/freeipa/host.js
@@ -108,6 +108,26 @@ return {
                             flags: ['w_if_no_aci']
                         },
                         {
+                            $type: 'custom_checkboxes',
+                            label: '@i18n:authtype.auth_indicators',
+                            name: 'krbprincipalauthind',
+                            add_dialog_title: '@i18n:authtype.custom_auth_ind_title',
+                            add_field_label: '@i18n:authtype.auth_indicator',
+                            options: [
+                                {
+                                    label: '@i18n:authtype.otp',
+                                    value: 'otp'
+                                },
+                                {
+                                    label: '@i18n:authtype.type_radius',
+                                    value: 'radius'
+                                }
+                            ],
+                            tooltip: {
+                                title: '@mc-opt:host_add:krbprincipalauthind:doc'
+                            }
+                        },
+                        {
                             name: 'ipakrbokasdelegate',
                             $type: 'checkbox',
                             acl_param: 'krbticketflags',
diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json
index 1d7f5d883dd923dc5ad749b592e55f23e7d4771b..491f151bc82dfa2dbcd0a05e98d0087e1390645a 100644
--- a/install/ui/test/data/ipa_init.json
+++ b/install/ui/test/data/ipa_init.json
@@ -49,6 +49,9 @@
                         "show_results": "Show Results"
                     },
                     "authtype": {
+                        "auth_indicators": "Authentication indicators",
+                        "auth_indicator": "Authentication indicator",
+                        "custom_auth_ind_title": "Add Custom Authentication Indicator",
                         "config_tooltip": "<p>Implicit method (password) will be used if no method is chosen.</p><p><strong>Password + Two-factor:</strong> LDAP and Kerberos allow authentication with either one of the authentication types but Kerberos uses pre-authentication method which requires to use armor ccache.</p><p><strong>RADIUS with another type:</strong> Kerberos always use RADIUS, but LDAP never does. LDAP only recognize the password and two-factor authentication options.</p>",
                         "otp": "OTP",
                         "type_otp": "Two factor authentication (password + OTP)",
@@ -532,10 +535,7 @@
                             "label_singular": "Server Role",
                         },
                         "service": {
-                            "auth_indicators": "Authentication indicators",
-                            "auth_indicator": "Authentication indicator",
                             "certificate": "Service Certificate",
-                            "custom_auth_ind_title": "Add Custom Authentication Indicator",
                             "delete_key_unprovision": "Delete Key, Unprovision",
                             "details": "Service Settings",
                             "host": "Host Name",
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index c0360567cbca883dda018a7a2f7f9f9536c3d118..5f69ed4e6a41b5dab4ba034e83bc09fd9958e173 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -184,7 +184,10 @@ class i18n_messages(Command):
             "show_results": _("Show Results"),
         },
         "authtype": {
+            "auth_indicators": _("Authentication indicators"),
+            "auth_indicator": _("Authentication indicator"),
             "config_tooltip": _("<p>Implicit method (password) will be used if no method is chosen.</p><p><strong>Password + Two-factor:</strong> LDAP and Kerberos allow authentication with either one of the authentication types but Kerberos uses pre-authentication method which requires to use armor ccache.</p><p><strong>RADIUS with another type:</strong> Kerberos always use RADIUS, but LDAP never does. LDAP only recognize the password and two-factor authentication options.</p>"),
+            "custom_auth_ind_title": _("Add Custom Authentication Indicator"),
             "otp": _("OTP"),
             "type_otp": _("Two factor authentication (password + OTP)"),
             "type_password": _("Password"),
@@ -671,10 +674,7 @@ class i18n_messages(Command):
                 "label_singular": _("Server Role"),
             },
             "service": {
-                "auth_indicators": _("Authentication indicators"),
-                "auth_indicator": _("Authentication indicator"),
                 "certificate": _("Service Certificate"),
-                "custom_auth_ind_title": _("Add Custom Authentication Indicator"),
                 "delete_key_unprovision": _("Delete Key, Unprovision"),
                 "details": _("Service Settings"),
                 "host": _("Host Name"),
-- 
2.5.5

From 4c942b066ed29f5b5b2e985801818cf24f4441fa Mon Sep 17 00:00:00 2001
From: Pavel Vomacka <pvoma...@redhat.com>
Date: Tue, 28 Jun 2016 15:41:33 +0200
Subject: [PATCH 2/2] Change paths of strings in auth indicators widget on
 service page

Strings which are used by widget which shows authentication indicators were moved.
Therefore the change in string paths.

Part of: https://fedorahosted.org/freeipa/ticket/5872
---
 install/ui/src/freeipa/service.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/install/ui/src/freeipa/service.js b/install/ui/src/freeipa/service.js
index 6f8e4efbd7f07574e924cbdeac970b70eb0a9b0e..bfca4da36de9ce0343a3b5a11e0385c1607eb1b1 100644
--- a/install/ui/src/freeipa/service.js
+++ b/install/ui/src/freeipa/service.js
@@ -110,10 +110,10 @@ return {
                         },
                         {
                             $type: 'custom_checkboxes',
-                            label: '@i18n:objects.service.auth_indicators',
+                            label: '@i18n:authtype.auth_indicators',
                             name: 'krbprincipalauthind',
-                            add_dialog_title: '@i18n:objects.service.custom_auth_ind_title',
-                            add_field_label: '@i18n:objects.service.auth_indicator',
+                            add_dialog_title: '@i18n:authtype.custom_auth_ind_title',
+                            add_field_label: '@i18n:authtype.auth_indicator',
                             options: [
                                 {
                                     label: '@i18n:authtype.otp',
-- 
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