From 003e502f87d1f240b4d952e53173a18d861d084c Mon Sep 17 00:00:00 2001 From: Stefan Reiter Date: Wed, 29 Jan 2020 11:27:20 +0100 Subject: [PATCH] gui/cluster: show cluster name from joinInfo in join dialog To help a user identify if they put in the joinInfo for the correct cluster. Signed-off-by: Stefan Reiter --- www/manager6/dc/ClusterEdit.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/www/manager6/dc/ClusterEdit.js b/www/manager6/dc/ClusterEdit.js index 0af858a5..132029c1 100644 --- a/www/manager6/dc/ClusterEdit.js +++ b/www/manager6/dc/ClusterEdit.js @@ -147,6 +147,7 @@ Ext.define('PVE.ClusterJoinNodeWindow', { info: { fp: '', ip: '', + clusterName: '', ring0Needed: false, ring1Possible: false, ring1Needed: false @@ -207,7 +208,8 @@ Ext.define('PVE.ClusterJoinNodeWindow', { fp: '', ring1Needed: false, ring1Possible: false, - ip: '' + ip: '', + clusterName: '' }; var totem = {}; @@ -224,7 +226,8 @@ Ext.define('PVE.ClusterJoinNodeWindow', { fp: joinInfo.fingerprint, ring0Needed: ring0Needed, ring1Possible: !!joinInfo.totem['interface']['1'], - ring1Needed: !!joinInfo.totem['interface']['1'] + ring1Needed: !!joinInfo.totem['interface']['1'], + clusterName: joinInfo.totem['cluster_name'] }; totem = joinInfo.totem; field.valid = true; @@ -288,6 +291,16 @@ Ext.define('PVE.ClusterJoinNodeWindow', { }, value: '' }, + { + xtype: 'textfield', + fieldLabel: gettext('Cluster name'), + readOnly: true, + submitValue: false, + bind: { + hidden: '{!assistedEntry.checked}', + value: '{info.clusterName}' + }, + }, { xtype: 'inputpanel', column1: [