diff options
| author | Stanislav Laznicka <slaznick@redhat.com> | 2017-03-08 13:07:12 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2017-03-13 16:10:28 +0100 |
| commit | 1e8db4b5c7a55dac0008ad9b9bf5802ba30e8c2a (patch) | |
| tree | 720ca3ec5f289c426d6663857009eaeb603e8013 /install/ui | |
| parent | 670f8fb1db109ec2c9ab7e5d2189325988220b23 (diff) | |
| download | freeipa-1e8db4b5c7a55dac0008ad9b9bf5802ba30e8c2a.tar.gz freeipa-1e8db4b5c7a55dac0008ad9b9bf5802ba30e8c2a.tar.xz freeipa-1e8db4b5c7a55dac0008ad9b9bf5802ba30e8c2a.zip | |
Add message about last KRA to WebUI Topology view
https://pagure.io/freeipa/issue/6538
Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Pavel Vomacka <pvomacka@redhat.com>
Diffstat (limited to 'install/ui')
| -rw-r--r-- | install/ui/src/freeipa/topology.js | 25 | ||||
| -rw-r--r-- | install/ui/test/data/ipa_init.json | 4 |
2 files changed, 20 insertions, 9 deletions
diff --git a/install/ui/src/freeipa/topology.js b/install/ui/src/freeipa/topology.js index ae94f983c..7559d78e5 100644 --- a/install/ui/src/freeipa/topology.js +++ b/install/ui/src/freeipa/topology.js @@ -501,23 +501,34 @@ topology.servers_search_facet = function(spec, no_init) { // Do not show warning if there is only one master if (result.length <= 1) return; - var counter = 0; + var ca_counter = 0; + var kra_counter = 0; for (var i=0, l=result.length; i<l; i++) { var current = result[i]; var roles = current.result.enabled_role_servrole; for (var k=0, m=roles.length; k<m; k++) { - if (roles[k] === 'CA server') counter++; + if (roles[k] === 'CA server') ca_counter++; + if (roles[k] === 'KRA server') kra_counter++; } } - // Create dialog and show it only when there is only one CA server - if (counter != 1) return; + // Show a dialog when there is only one CA or KRA server + if (ca_counter != 1 && kra_counter != 1) return; + + var message = text.get( + '@i18n:objects.servers.svc_warning_message') + '<ul>'; + if (ca_counter === 1) { + message += '<li>CA</li>\n'; + } + if (kra_counter === 1) { + message += '<li>KRA</li>\n'; + } + message += '</ul>'; - var message = text.get('@i18n:objects.servers.ca_warning_message'); var dialog = IPA.dialog({ - name: 'ca_warning', - title: '@i18n:objects.servers.ca_warning_title', + name: 'svc_warning', + title: '@i18n:objects.servers.svc_warning_title', sections: [ { show_header: false, diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index 7d5b32b2e..820f7aa77 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -556,8 +556,8 @@ "label_singular": "Server Role", }, "servers": { - "ca_warning_message": "It is strongly recommended to keep the CA services installed on more than one server.", - "ca_warning_title": "Warning: Only One CA Server Detected", + "svc_warning_title": "Warning: Consider service replication", + "svc_warning_message": "It is strongly recommended to keep the following services installed on more than one server:", "remove_server": "Delete Server", "remove_server_msg": "Deleting a server removes it permanently from the topology. Note that this is a non-reversible action." }, |