public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v3 manager 01/20] fix extension filter for upload window
Date: Fri, 13 Nov 2020 14:16:14 +0100	[thread overview]
Message-ID: <20201113131633.21915-2-f.ebner@proxmox.com> (raw)
In-Reply-To: <20201113131633.21915-1-f.ebner@proxmox.com>

so that it selects the correct filter for container templates

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
 www/manager6/storage/ContentView.js | 43 ++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/www/manager6/storage/ContentView.js b/www/manager6/storage/ContentView.js
index a879cc19..bc144fa4 100644
--- a/www/manager6/storage/ContentView.js
+++ b/www/manager6/storage/ContentView.js
@@ -193,6 +193,30 @@ Ext.define('PVE.storage.Upload', {
 	    hidden: true
 	});
 
+	let acceptedExtensions = {
+	    iso: ".img, .iso",
+	    vztmpl: ".tar.gz, .tar.xz",
+	};
+
+	let defaultContent = me.contents[0] || '';
+
+	let fileField = Ext.create('Ext.form.field.File', {
+	    name: 'filename',
+	    buttonText: gettext('Select File...'),
+	    allowBlank: false,
+	    setAccept: function(content) {
+		let acceptString = acceptedExtensions[content] || '';
+		this.fileInputEl.set({
+		    accept: acceptString,
+		});
+	    },
+	    listeners: {
+		afterrender: function(cmp) {
+		    cmp.setAccept(defaultContent);
+		},
+	    },
+	});
+
 	me.formPanel = Ext.create('Ext.form.Panel', {
 	    method: 'POST',
 	    waitMsgTarget: true,
@@ -209,22 +233,15 @@ Ext.define('PVE.storage.Upload', {
 		    cts: me.contents,
 		    fieldLabel: gettext('Content'),
 		    name: 'content',
-		    value: me.contents[0] || '',
-		    allowBlank: false
-		},
-		{
-		    xtype: 'filefield',
-		    name: 'filename',
-		    buttonText: gettext('Select File...'),
+		    value: defaultContent,
 		    allowBlank: false,
 		    listeners: {
-			afterrender: function(cmp) {
-			    cmp.fileInputEl.set({
-				accept: '.img, .iso'
-			    });
-			}
-		    }
+			change: function(cmp, newValue, oldValue) {
+			    fileField.setAccept(newValue);
+			},
+		    },
 		},
+		fileField,
 		pbar
 	    ]
 	});
-- 
2.20.1





  reply	other threads:[~2020-11-13 13:17 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-13 13:16 [pve-devel] [PATCH-SERIES v3 manager] split up content view into a view for each type Fabian Ebner
2020-11-13 13:16 ` Fabian Ebner [this message]
2020-11-13 13:16 ` [pve-devel] [PATCH v3 manager 02/20] config panel: allow new nodes to be added later Fabian Ebner
2020-11-13 13:16 ` [pve-devel] [PATCH v3 manager 03/20] storage panel/browser: use insertNodes function Fabian Ebner
2020-11-13 13:16 ` [pve-devel] [PATCH v3 manager 04/20] add CD ROM and lxc icons for treelist-item-icon Fabian Ebner
2020-11-13 13:16 ` [pve-devel] [PATCH v3 manager 05/20] use separate view for each content type Fabian Ebner
2020-11-13 13:16 ` [pve-devel] [PATCH v3 manager 06/20] remove the now unnecessary grouping by " Fabian Ebner
2020-11-13 13:16 ` [pve-devel] [PATCH v3 manager 07/20] remove the now unneccessary content type column Fabian Ebner
2020-11-13 13:16 ` [pve-devel] [PATCH v3 manager 08/20] content view: allow specifying title bar elements for init Fabian Ebner
2020-11-13 13:16 ` [pve-devel] [PATCH v3 manager 09/20] turn {nodename, storage, sm} into object variables Fabian Ebner
2020-11-13 13:16 ` [pve-devel] [PATCH v3 manager 10/20] add upload button conditionally Fabian Ebner
2020-11-13 13:16 ` [pve-devel] [PATCH v3 manager 11/20] create and use TemplateView Fabian Ebner
2020-11-13 13:16 ` [pve-devel] [PATCH v3 manager 12/20] create and use BackupView Fabian Ebner
2020-11-13 13:16 ` [pve-devel] [PATCH v3 manager 13/20] get rid of unneccessary enableFn's Fabian Ebner
2020-11-13 13:16 ` [pve-devel] [PATCH v3 manager 14/20] create ImageView and use it for VM and CT images Fabian Ebner
2020-11-13 13:16 ` [pve-devel] [PATCH v3 manager 15/20] simplify reload call Fabian Ebner
2020-11-13 13:16 ` [pve-devel] [RFC v3 manager 16/20] content view: allow specifying which columns to show on init Fabian Ebner
2020-11-13 13:16 ` [pve-devel] [PATCH v3 manager 17/20] group backups by backup groups in backup view Fabian Ebner
2020-11-13 13:16 ` [pve-devel] [PATCH v3 manager 18/20] allow child classes of ContentView to specify their own listeners Fabian Ebner
2020-11-13 13:16 ` [pve-devel] [PATCH v3 manager 19/20] add CSS for button in grid's group header Fabian Ebner
2020-11-13 13:16 ` [pve-devel] [PATCH v3 manager 20/20] backup view: add prune window Fabian Ebner
2020-11-16  9:11 ` [pve-devel] patrially-applied-series: [PATCH-SERIES v3 manager] split up content view into a view for each type Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201113131633.21915-2-f.ebner@proxmox.com \
    --to=f.ebner@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal