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 v2 manager 08/20] content view: allow specifying title bar elements for init
Date: Wed, 16 Sep 2020 14:50:29 +0200	[thread overview]
Message-ID: <20200916125041.4151-9-f.ebner@proxmox.com> (raw)
In-Reply-To: <20200916125041.4151-1-f.ebner@proxmox.com>

in preparation to create derived classes.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---

use --color-moved=zebra --color-moved-ws=ignore-all-space --patience
to the make patch more readable

 www/manager6/storage/ContentView.js | 145 ++++++++++++++--------------
 1 file changed, 75 insertions(+), 70 deletions(-)

diff --git a/www/manager6/storage/ContentView.js b/www/manager6/storage/ContentView.js
index 53c93944..1218f65c 100644
--- a/www/manager6/storage/ContentView.js
+++ b/www/manager6/storage/ContentView.js
@@ -518,81 +518,86 @@ Ext.define('PVE.storage.ContentView', {
 	    }
 	});
 
-	Ext.apply(me, {
-	    store: store,
-	    selModel: sm,
-	    tbar: [
-		{
-		    xtype: 'proxmoxButton',
-		    text: gettext('Restore'),
-		    selModel: sm,
-		    disabled: true,
-		    enableFn: function(rec) {
-			return rec && rec.data.content === 'backup';
-		    },
-		    handler: function(b, e, rec) {
-			var vmtype;
-			if (PVE.Utils.volume_is_qemu_backup(rec.data.volid, rec.data.format)) {
-			    vmtype = 'qemu';
-			} else if (PVE.Utils.volume_is_lxc_backup(rec.data.volid, rec.data.format)) {
-			    vmtype = 'lxc';
-			} else {
-			    return;
-			}
-
-			var win = Ext.create('PVE.window.Restore', {
-			    nodename: nodename,
-			    volid: rec.data.volid,
-			    volidText: PVE.Utils.render_storage_content(rec.data.volid, {}, rec),
-			    vmtype: vmtype
-			});
-			win.show();
-			win.on('destroy', reload);
-		    }
+	if (!me.tbar) {
+	    me.tbar = [];
+	}
+	me.tbar.push(
+	    {
+		xtype: 'proxmoxButton',
+		text: gettext('Restore'),
+		selModel: sm,
+		disabled: true,
+		enableFn: function(rec) {
+		    return rec && rec.data.content === 'backup';
 		},
-		removeButton,
-		imageRemoveButton,
-		templateButton,
-		uploadButton,
-		{
-		    xtype: 'proxmoxButton',
-		    text: gettext('Show Configuration'),
-		    disabled: true,
-		    selModel: sm,
-		    enableFn: function(rec) {
-			return rec && rec.data.content === 'backup';
-		    },
-		    handler: function(b,e,rec) {
-			var win = Ext.create('PVE.window.BackupConfig', {
-			    volume: rec.data.volid,
-			    pveSelNode: me.pveSelNode
-			});
-
-			win.show();
+		handler: function(b, e, rec) {
+		    var vmtype;
+		    if (PVE.Utils.volume_is_qemu_backup(rec.data.volid, rec.data.format)) {
+			vmtype = 'qemu';
+		    } else if (PVE.Utils.volume_is_lxc_backup(rec.data.volid, rec.data.format)) {
+			vmtype = 'lxc';
+		    } else {
+			return;
 		    }
+
+		    var win = Ext.create('PVE.window.Restore', {
+			nodename: nodename,
+			volid: rec.data.volid,
+			volidText: PVE.Utils.render_storage_content(rec.data.volid, {}, rec),
+			vmtype: vmtype
+		    });
+		    win.show();
+		    win.on('destroy', reload);
+		}
+	    },
+	    removeButton,
+	    imageRemoveButton,
+	    templateButton,
+	    uploadButton,
+	    {
+		xtype: 'proxmoxButton',
+		text: gettext('Show Configuration'),
+		disabled: true,
+		selModel: sm,
+		enableFn: function(rec) {
+		    return rec && rec.data.content === 'backup';
 		},
-		'->',
-		gettext('Search') + ':', ' ',
-		{
-		    xtype: 'textfield',
-		    width: 200,
-		    enableKeyEvents: true,
-		    listeners: {
-			buffer: 500,
-			keyup: function(field) {
-			    store.clearFilter(true);
-			    store.filter([
-				{
-				    property: 'text',
-				    value: field.getValue(),
-				    anyMatch: true,
-				    caseSensitive: false
-				}
-			    ]);
-			}
+		handler: function(b,e,rec) {
+		    var win = Ext.create('PVE.window.BackupConfig', {
+			volume: rec.data.volid,
+			pveSelNode: me.pveSelNode
+		    });
+
+		    win.show();
+		}
+	    },
+	    '->',
+	    gettext('Search') + ':', ' ',
+	    {
+		xtype: 'textfield',
+		width: 200,
+		enableKeyEvents: true,
+		listeners: {
+		    buffer: 500,
+		    keyup: function(field) {
+			store.clearFilter(true);
+			store.filter([
+			    {
+				property: 'text',
+				value: field.getValue(),
+				anyMatch: true,
+				caseSensitive: false
+			    }
+			]);
 		    }
 		}
-	    ],
+	    }
+	);
+
+	Ext.apply(me, {
+	    store: store,
+	    selModel: sm,
+	    tbar: me.tbar,
 	    columns: [
 		{
 		    header: gettext('Name'),
-- 
2.20.1





  parent reply	other threads:[~2020-09-16 12:51 UTC|newest]

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

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=20200916125041.4151-9-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