Signed-off-by: Fabian Ebner <[email protected]>
---
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
_______________________________________________
pve-devel mailing list
[email protected]
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
