From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <f.ebner@proxmox.com>
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 96311624A1
for <pve-devel@lists.proxmox.com>; Wed, 16 Sep 2020 14:50:54 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 36E282413B
for <pve-devel@lists.proxmox.com>; Wed, 16 Sep 2020 14:50:54 +0200 (CEST)
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 416A4240DC
for <pve-devel@lists.proxmox.com>; Wed, 16 Sep 2020 14:50:51 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 01F67453ED
for <pve-devel@lists.proxmox.com>; Wed, 16 Sep 2020 14:50:51 +0200 (CEST)
From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Wed, 16 Sep 2020 14:50:31 +0200
Message-Id: <20200916125041.4151-11-f.ebner@proxmox.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20200916125041.4151-1-f.ebner@proxmox.com>
References: <20200916125041.4151-1-f.ebner@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.062 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: [pve-devel] [PATCH v2 manager 10/20] add upload button conditionally
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Wed, 16 Sep 2020 12:50:54 -0000
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
www/manager6/storage/Browser.js | 2 ++
www/manager6/storage/ContentView.js | 13 ++++---------
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/www/manager6/storage/Browser.js b/www/manager6/storage/Browser.js
index 1e1be6bc..6e455625 100644
--- a/www/manager6/storage/Browser.js
+++ b/www/manager6/storage/Browser.js
@@ -80,6 +80,7 @@ Ext.define('PVE.storage.Browser', {
content: 'iso',
stateful: true,
stateId: 'grid-storage-content-iso',
+ useUploadButton: true,
});
}
if (contents.includes('rootdir')) {
@@ -113,6 +114,7 @@ Ext.define('PVE.storage.Browser', {
content: 'vztmpl',
stateful: true,
stateId: 'grid-storage-content-vztmpl',
+ useUploadButton: true,
});
}
me.insertNodes(items);
diff --git a/www/manager6/storage/ContentView.js b/www/manager6/storage/ContentView.js
index 6e7ae630..dfc98a05 100644
--- a/www/manager6/storage/ContentView.js
+++ b/www/manager6/storage/ContentView.js
@@ -440,24 +440,17 @@ Ext.define('PVE.storage.ContentView', {
}
var uploadButton = Ext.create('Proxmox.button.Button', {
- contents : ['iso','vztmpl'],
text: gettext('Upload'),
handler: function() {
- var me = this;
var win = Ext.create('PVE.storage.Upload', {
nodename: nodename,
storage: storage,
- contents: me.contents
+ contents: [content],
});
win.show();
win.on('destroy', reload);
}
});
- if (content === 'iso' || content === 'vztmpl') {
- uploadButton.contents = [content];
- } else {
- uploadButton.setDisabled(true);
- }
var imageRemoveButton;
var removeButton = Ext.create('Proxmox.button.StdRemoveButton',{
@@ -530,6 +523,9 @@ Ext.define('PVE.storage.ContentView', {
if (!me.tbar) {
me.tbar = [];
}
+ if (me.useUploadButton) {
+ me.tbar.push(uploadButton);
+ }
me.tbar.push(
{
xtype: 'proxmoxButton',
@@ -562,7 +558,6 @@ Ext.define('PVE.storage.ContentView', {
removeButton,
imageRemoveButton,
templateButton,
- uploadButton,
{
xtype: 'proxmoxButton',
text: gettext('Show Configuration'),
--
2.20.1