diff --git a/www/manager6/Workspace.js b/www/manager6/Workspace.js index c7b887613..f75356c59 100644 --- a/www/manager6/Workspace.js +++ b/www/manager6/Workspace.js @@ -60,7 +60,7 @@ Ext.define('PVE.Workspace', { // fixme: what about other errors Ext.Ajax.on('requestexception', function(conn, response, options) { - if (response.status == 401) { // auth failure + if (response.status == 401 && !PVE.Utils.silenceAuthFailures) { // auth failure me.showLogin(); } }); diff --git a/www/manager6/dc/ClusterEdit.js b/www/manager6/dc/ClusterEdit.js index 5a7195027..bdf1ae699 100644 --- a/www/manager6/dc/ClusterEdit.js +++ b/www/manager6/dc/ClusterEdit.js @@ -140,6 +140,11 @@ Ext.define('PVE.ClusterJoinNodeWindow', { controller: { xclass: 'Ext.app.ViewController', control: { + '#': { + close: function() { + delete PVE.Utils.silenceAuthFailures; + } + }, 'proxmoxcheckbox[name=assistedInput]': { change: 'onInputTypeChange' }, @@ -197,7 +202,14 @@ Ext.define('PVE.ClusterJoinNodeWindow', { } }, + submit: function() { + // joining may produce temporarily auth failures, ignore as long the task runs + PVE.Utils.silenceAuthFailures = true; + this.callParent(); + }, + taskDone: function(success) { + delete PVE.Utils.silenceAuthFailures; if (success) { var txt = gettext('Cluster join task finished, node certificate may have changed, reload GUI!'); // ensure user cannot do harm