From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 4/5] ui: tape: ChangerStatus: remove changerselector combobox
Date: Mon, 1 Mar 2021 12:22:42 +0100 [thread overview]
Message-ID: <20210301112243.15842-4-d.csapak@proxmox.com> (raw)
In-Reply-To: <20210301112243.15842-1-d.csapak@proxmox.com>
because we now select it directly in the left-hand tree
so we have to adapt the changer to the one set by the router
and not by the drop down field
and remove it from the TapeManagement tabpanel
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
NOTE: this patch and the last 2 are very interdependent, but i wanted
to split them as it is easier to review that way. If wanted, they could
be squashed into a single commit
www/tape/ChangerStatus.js | 80 +++++++++++++-------------------------
www/tape/TapeManagement.js | 5 ---
2 files changed, 26 insertions(+), 59 deletions(-)
diff --git a/www/tape/ChangerStatus.js b/www/tape/ChangerStatus.js
index 1a7bcf6a..dab34038 100644
--- a/www/tape/ChangerStatus.js
+++ b/www/tape/ChangerStatus.js
@@ -15,34 +15,14 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
extend: 'Ext.panel.Panel',
alias: 'widget.pbsChangerStatus',
- viewModel: {
- data: {
- changer: '',
- },
-
- formulas: {
- changerSelected: (get) => get('changer') !== '',
- },
- },
-
controller: {
xclass: 'Ext.app.ViewController',
- changerChange: function(field, value) {
+ importTape: function(v, rI, cI, button, el, record) {
let me = this;
let view = me.getView();
- let vm = me.getViewModel();
- vm.set('changer', value);
- if (view.rendered) {
- me.reload();
- }
- },
-
- importTape: function(view, rI, cI, button, el, record) {
- let me = this;
- let vm = me.getViewModel();
let from = record.data['entry-id'];
- let changer = encodeURIComponent(vm.get('changer'));
+ let changer = encodeURIComponent(view.changer);
Ext.create('Proxmox.window.Edit', {
title: gettext('Import'),
isCreate: true,
@@ -71,11 +51,11 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
}).show();
},
- slotTransfer: function(view, rI, cI, button, el, record) {
+ slotTransfer: function(v, rI, cI, button, el, record) {
let me = this;
- let vm = me.getViewModel();
+ let view = me.getView();
let from = record.data['entry-id'];
- let changer = encodeURIComponent(vm.get('changer'));
+ let changer = encodeURIComponent(view.changer);
Ext.create('Proxmox.window.Edit', {
title: gettext('Transfer'),
isCreate: true,
@@ -104,12 +84,12 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
}).show();
},
- erase: function(view, rI, cI, button, el, record) {
+ erase: function(v, rI, cI, button, el, record) {
let me = this;
- let vm = me.getViewModel();
+ let view = me.getView();
let label = record.data['label-text'];
- let changer = vm.get('changer');
+ let changer = encodeURIComponent(view.changer);
Ext.create('PBS.TapeManagement.EraseWindow', {
label,
changer,
@@ -121,12 +101,12 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
}).show();
},
- load: function(view, rI, cI, button, el, record) {
+ load: function(v, rI, cI, button, el, record) {
let me = this;
- let vm = me.getViewModel();
+ let view = me.getView();
let label = record.data['label-text'];
- let changer = vm.get('changer');
+ let changer = encodeURIComponent(view.changer);
Ext.create('Proxmox.window.Edit', {
isCreate: true,
@@ -163,7 +143,7 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
});
},
- unload: async function(view, rI, cI, button, el, record) {
+ unload: async function(v, rI, cI, button, el, record) {
let me = this;
let drive = record.data.name;
try {
@@ -231,8 +211,8 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
barcodeLabel: function() {
let me = this;
- let vm = me.getViewModel();
- let changer = vm.get('changer');
+ let view = me.getView();
+ let changer = view.changer;
if (changer === '') {
return;
}
@@ -268,8 +248,8 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
inventory: function() {
let me = this;
- let vm = me.getViewModel();
- let changer = vm.get('changer');
+ let view = me.getView();
+ let changer = view.changer;
if (changer === '') {
return;
}
@@ -326,8 +306,7 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
reload_full: async function(use_cache) {
let me = this;
let view = me.getView();
- let vm = me.getViewModel();
- let changer = vm.get('changer');
+ let changer = view.changer;
if (changer === '') {
return;
}
@@ -483,6 +462,15 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
},
},
},
+
+ init: function(view) {
+ let me = this;
+ if (!view.changer) {
+ throw "no changer given";
+ }
+
+ view.title = `${gettext("Changer")}: ${view.changer}`;
+ },
},
listeners: {
@@ -490,16 +478,6 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
},
tbar: [
- {
- fieldLabel: gettext('Changer'),
- xtype: 'pbsChangerSelector',
- reference: 'changerselector',
- autoSelect: true,
- listeners: {
- change: 'changerChange',
- },
- },
- '-',
{
text: gettext('Reload'),
xtype: 'proxmoxButton',
@@ -512,18 +490,12 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
xtype: 'proxmoxButton',
handler: 'barcodeLabel',
iconCls: 'fa fa-barcode',
- bind: {
- disabled: '{!changerSelected}',
- },
},
{
text: gettext('Inventory'),
xtype: 'proxmoxButton',
handler: 'inventory',
iconCls: 'fa fa-book',
- bind: {
- disabled: '{!changerSelected}',
- },
},
],
diff --git a/www/tape/TapeManagement.js b/www/tape/TapeManagement.js
index 265b2b77..bac37d9c 100644
--- a/www/tape/TapeManagement.js
+++ b/www/tape/TapeManagement.js
@@ -21,11 +21,6 @@ Ext.define('PBS.TapeManagement', {
itemId: 'inventory',
xtype: 'pbsTapeInventory',
},
- {
- title: gettext('Library'),
- itemId: 'library',
- xtype: 'pbsChangerStatus',
- },
{
title: gettext('Changers'),
itemId: 'changers',
--
2.20.1
next prev parent reply other threads:[~2021-03-01 11:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-01 11:22 [pbs-devel] [PATCH proxmox-backup 1/5] ui: tape: add DriveStatus panel Dominik Csapak
2021-03-01 11:22 ` [pbs-devel] [PATCH proxmox-backup 2/5] ui: MainView: adapt router to add changer/drive entries Dominik Csapak
2021-03-01 11:22 ` [pbs-devel] [PATCH proxmox-backup 3/5] ui: NavigationTree: add entries for changers/drives Dominik Csapak
2021-03-01 11:22 ` Dominik Csapak [this message]
2021-03-01 11:22 ` [pbs-devel] [PATCH proxmox-backup 5/5] ui: tape/ChangerStatus: handle vanishing view during reload Dominik Csapak
2021-03-01 11:39 ` [pbs-devel] applied: [PATCH proxmox-backup 1/5] ui: tape: add DriveStatus panel Dietmar Maurer
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=20210301112243.15842-4-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pbs-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