IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add message about last KRA to WebUI Topology view

Browse Source 
https://pagure.io/freeipa/issue/6538

Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Pavel Vomacka <pvomacka@redhat.com>
This commit is contained in:
Stanislav Laznicka 2017-03-08 13:07:12 +01:00 committed by Martin Basti
parent 670f8fb1db
commit 1e8db4b5c7
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
install/ui/src/freeipa/topology.js
View File

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

4
install/ui/test/data/ipa_init.json
View File

@ -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."
},

4
ipaserver/plugins/internal.py
View File

@ -737,8 +737,8 @@ class i18n_messages(Command):
"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.")
},