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 04D5F605E4 for ; Wed, 2 Sep 2020 13:04:23 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BD70910184 for ; Wed, 2 Sep 2020 13:03:50 +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 D558F100FB for ; Wed, 2 Sep 2020 13:03:47 +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 A02E4449CF for ; Wed, 2 Sep 2020 13:03:47 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Wed, 2 Sep 2020 13:03:28 +0200 Message-Id: <20200902110337.25004-6-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200902110337.25004-1-f.ebner@proxmox.com> References: <20200902110337.25004-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.046 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 manager 05/14] content view: allow specifying title bar elements for init X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 11:04:23 -0000 in preparation to create derived classes. Signed-off-by: Fabian Ebner --- use --color-moved=zebra --color-moved-ws=ignore-all-space --patience to 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 2c320bec..45e40074 100644 --- a/www/manager6/storage/ContentView.js +++ b/www/manager6/storage/ContentView.js @@ -501,81 +501,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