From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 3/4] ui: tape/BackupJobEdit: add second tab with group filters
Date: Mon, 22 Nov 2021 15:20:23 +0100 [thread overview]
Message-ID: <20211122142024.913238-4-d.csapak@proxmox.com> (raw)
In-Reply-To: <20211122142024.913238-1-d.csapak@proxmox.com>
adds a second tab and adapts the styling to our usual one (border/padding)
adds a change listener to the datastore selector to change it on the
group filters
remaining changes are mostly indentation changes
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
www/tape/window/TapeBackupJob.js | 231 +++++++++++++++++--------------
1 file changed, 128 insertions(+), 103 deletions(-)
diff --git a/www/tape/window/TapeBackupJob.js b/www/tape/window/TapeBackupJob.js
index 72821115..266360ce 100644
--- a/www/tape/window/TapeBackupJob.js
+++ b/www/tape/window/TapeBackupJob.js
@@ -11,6 +11,8 @@ Ext.define('PBS.TapeManagement.BackupJobEdit', {
fieldDefaults: { labelWidth: 120 },
+ bodyPadding: 0,
+
cbindData: function(initialConfig) {
let me = this;
@@ -28,117 +30,140 @@ Ext.define('PBS.TapeManagement.BackupJobEdit', {
},
items: {
- xtype: 'inputpanel',
- onGetValues: function(values) {
- let me = this;
-
- if (values['export-media-set'] && !me.up('pbsTapeBackupJobEdit').isCreate) {
- Proxmox.Utils.assemble_field_data(values, { "delete": 'eject-media' });
- }
- PBS.Utils.delete_if_default(values, 'notify-user');
- return values;
- },
- column1: [
- {
- xtype: 'pmxDisplayEditField',
- name: 'id',
- fieldLabel: gettext('Job ID'),
- renderer: Ext.htmlEncode,
- allowBlank: false,
- cbind: {
- editable: '{isCreate}',
- },
- },
- {
- xtype: 'pbsDataStoreSelector',
- fieldLabel: gettext('Local Datastore'),
- name: 'store',
- },
- {
- xtype: 'pbsMediaPoolSelector',
- fieldLabel: gettext('Media Pool'),
- name: 'pool',
- },
- {
- xtype: 'pbsDriveSelector',
- fieldLabel: gettext('Drive'),
- name: 'drive',
- },
+ xtype: 'tabpanel',
+ bodyPadding: 10,
+ border: 0,
+ items: [
{
- xtype: 'pmxUserSelector',
- name: 'notify-user',
- fieldLabel: gettext('Notify User'),
- emptyText: 'root@pam',
- allowBlank: true,
- value: null,
- renderer: Ext.String.htmlEncode,
- },
- ],
+ title: gettext('Options'),
+ xtype: 'inputpanel',
+ onGetValues: function(values) {
+ let me = this;
- column2: [
- {
- fieldLabel: gettext('Schedule'),
- xtype: 'pbsCalendarEvent',
- name: 'schedule',
- emptyText: gettext('none (disabled)'),
- cbind: {
- deleteEmpty: '{!isCreate}',
- value: '{scheduleValue}',
- },
- },
- {
- fieldLabel: gettext('Export Media-Set'),
- xtype: 'proxmoxcheckbox',
- name: 'export-media-set',
- cbind: {
- deleteEmpty: '{!isCreate}',
+ if (values['export-media-set'] && !me.up('pbsTapeBackupJobEdit').isCreate) {
+ Proxmox.Utils.assemble_field_data(values, { "delete": 'eject-media' });
+ }
+ PBS.Utils.delete_if_default(values, 'notify-user');
+ return values;
},
- listeners: {
- change: function(cb, value) {
- let me = this;
- let eject = me.up('window').down('proxmoxcheckbox[name=eject-media]');
- if (value) {
- eject.setValue(false);
- }
- eject.setDisabled(!!value);
+ column1: [
+ {
+ xtype: 'pmxDisplayEditField',
+ name: 'id',
+ fieldLabel: gettext('Job ID'),
+ renderer: Ext.htmlEncode,
+ allowBlank: false,
+ cbind: {
+ editable: '{isCreate}',
+ },
},
- },
- },
- {
- fieldLabel: gettext('Eject Media'),
- xtype: 'proxmoxcheckbox',
- name: 'eject-media',
- cbind: {
- deleteEmpty: '{!isCreate}',
- },
- },
- {
- fieldLabel: gettext('Latest Only'),
- xtype: 'proxmoxcheckbox',
- name: 'latest-only',
- cbind: {
- deleteEmpty: '{!isCreate}',
- },
- },
- ],
+ {
+ xtype: 'pbsDataStoreSelector',
+ fieldLabel: gettext('Local Datastore'),
+ name: 'store',
+ listeners: {
+ change: function(field, value) {
+ let me = this;
+ me.up('tabpanel').down('pbsGroupFilter').setLocalDatastore(value);
+ },
+ },
+ },
+ {
+ xtype: 'pbsMediaPoolSelector',
+ fieldLabel: gettext('Media Pool'),
+ name: 'pool',
+ },
+ {
+ xtype: 'pbsDriveSelector',
+ fieldLabel: gettext('Drive'),
+ name: 'drive',
+ },
+ {
+ xtype: 'pmxUserSelector',
+ name: 'notify-user',
+ fieldLabel: gettext('Notify User'),
+ emptyText: 'root@pam',
+ allowBlank: true,
+ value: null,
+ renderer: Ext.String.htmlEncode,
+ },
+ ],
- columnB: [
- {
- fieldLabel: gettext('Backup Groups'),
- xtype: 'displayfield',
- name: 'group-filter',
- renderer: v => v ? Ext.String.htmlEncode(v) : gettext('All'),
- cbind: {
- hidden: '{isCreate}',
- },
+ column2: [
+ {
+ fieldLabel: gettext('Schedule'),
+ xtype: 'pbsCalendarEvent',
+ name: 'schedule',
+ emptyText: gettext('none (disabled)'),
+ cbind: {
+ deleteEmpty: '{!isCreate}',
+ value: '{scheduleValue}',
+ },
+ },
+ {
+ fieldLabel: gettext('Export Media-Set'),
+ xtype: 'proxmoxcheckbox',
+ name: 'export-media-set',
+ cbind: {
+ deleteEmpty: '{!isCreate}',
+ },
+ listeners: {
+ change: function(cb, value) {
+ let me = this;
+ let eject = me.up('window').down('proxmoxcheckbox[name=eject-media]');
+ if (value) {
+ eject.setValue(false);
+ }
+ eject.setDisabled(!!value);
+ },
+ },
+ },
+ {
+ fieldLabel: gettext('Eject Media'),
+ xtype: 'proxmoxcheckbox',
+ name: 'eject-media',
+ cbind: {
+ deleteEmpty: '{!isCreate}',
+ },
+ },
+ {
+ fieldLabel: gettext('Latest Only'),
+ xtype: 'proxmoxcheckbox',
+ name: 'latest-only',
+ cbind: {
+ deleteEmpty: '{!isCreate}',
+ },
+ },
+ ],
+
+ columnB: [
+ {
+ fieldLabel: gettext('Comment'),
+ xtype: 'proxmoxtextfield',
+ name: 'comment',
+ cbind: {
+ deleteEmpty: '{!isCreate}',
+ },
+ },
+ ],
},
{
- fieldLabel: gettext('Comment'),
- xtype: 'proxmoxtextfield',
- name: 'comment',
- cbind: {
- deleteEmpty: '{!isCreate}',
+ xtype: 'inputpanel',
+ onGetValues: function(values) {
+ PBS.Utils.delete_if_default(values, 'group-filter');
+ if (Ext.isArray(values['group-filter']) && values['group-filter'].length === 0) {
+ delete values['group-filter'];
+ values.delete = 'group-filter';
+ }
+ return values;
},
+ title: gettext('Group Filter'),
+ items: [
+ {
+ xtype: 'pbsGroupFilter',
+ name: 'group-filter',
+ },
+ ],
},
],
},
--
2.30.2
next prev parent reply other threads:[~2021-11-22 14:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-22 14:20 [pbs-devel] [PATCH proxmox-backup 0/4] ui for group-filters Dominik Csapak
2021-11-22 14:20 ` [pbs-devel] [PATCH proxmox-backup 1/4] ui: add GroupSelector Dominik Csapak
2021-11-22 14:20 ` [pbs-devel] [PATCH proxmox-backup 2/4] ui: add GroupFilter form field(container) Dominik Csapak
2021-11-22 14:20 ` Dominik Csapak [this message]
2021-11-22 14:20 ` [pbs-devel] [PATCH proxmox-backup 4/4] ui: SyncJobEdit: add second tab with group filters Dominik Csapak
2021-11-24 9:04 ` [pbs-devel] [PATCH proxmox-backup 0/4] ui for group-filters Fabian Grünbichler
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=20211122142024.913238-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