From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id E6A0B697E9 for ; Fri, 13 Nov 2020 15:03:07 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DDA6F1C1CA for ; Fri, 13 Nov 2020 15:02:37 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 38A061C1BF for ; Fri, 13 Nov 2020 15:02:37 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id F21EE42757 for ; Fri, 13 Nov 2020 15:02:36 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 13 Nov 2020 15:02:36 +0100 Message-Id: <20201113140236.31570-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201113140236.31570-1-d.csapak@proxmox.com> References: <20201113140236.31570-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.358 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup 3/3] ui: improve comment behaviour for datastore Summary X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Nov 2020 14:03:07 -0000 when we could not load the config (e.g. missing permissions) show the comment from the global datastore-list also show a messagebox for a load error instead of setting the text of the comment box Signed-off-by: Dominik Csapak --- www/datastore/Notes.js | 2 +- www/datastore/Summary.js | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/www/datastore/Notes.js b/www/datastore/Notes.js index 21462805..2928b7ec 100644 --- a/www/datastore/Notes.js +++ b/www/datastore/Notes.js @@ -56,7 +56,7 @@ Ext.define('PBS.DataStoreNotes', { url: me.url, waitMsgTarget: me, failure: function(response, opts) { - me.update(gettext('Error') + " " + response.htmlStatus); + Ext.Msg.alert(gettext('Error'), response.htmlStatus); me.setCollapsed(false); }, success: function(response, opts) { diff --git a/www/datastore/Summary.js b/www/datastore/Summary.js index 41fd7c85..c263846a 100644 --- a/www/datastore/Summary.js +++ b/www/datastore/Summary.js @@ -264,6 +264,13 @@ Ext.define('PBS.DataStoreSummary', { me.down('pbsDataStoreInfo').setTitle(`${me.datastore} (${path})`); me.down('pbsDataStoreNotes').setNotes(response.result.data.comment); }, + failure: function(response) { + // fallback if e.g. we have no permissions to the config + let rec = Ext.getStore('pbs-datastore-list').findRecord('store', me.datastore); + if (rec) { + me.down('pbsDataStoreNotes').setNotes(rec.data.comment || ""); + } + }, }); me.query('proxmoxRRDChart').forEach((chart) => { -- 2.20.1