From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager v2 6/6] ui: dc/backup: show id+schedule instead of dow+starttime
Date: Mon, 8 Nov 2021 14:07:58 +0100 [thread overview]
Message-ID: <20211108130758.160914-8-d.csapak@proxmox.com> (raw)
In-Reply-To: <20211108130758.160914-1-d.csapak@proxmox.com>
we can now show the id (since its not autogenerated anymore),
and we can always show/edit the schedule instead of the dow+starttime
also add an 'ID' field to the edit/create window and update the
backupinfo window as well
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
www/manager6/dc/Backup.js | 46 ++++++++++++++----------------
www/manager6/dc/BackupJobDetail.js | 10 ++-----
2 files changed, 23 insertions(+), 33 deletions(-)
diff --git a/www/manager6/dc/Backup.js b/www/manager6/dc/Backup.js
index adefc5f4..dede8e6e 100644
--- a/www/manager6/dc/Backup.js
+++ b/www/manager6/dc/Backup.js
@@ -176,24 +176,22 @@ Ext.define('PVE.dc.BackupEdit', {
});
let column1 = [
- nodesel,
- storagesel,
{
- xtype: 'pveDayOfWeekSelector',
- name: 'dow',
- fieldLabel: gettext('Day of week'),
- multiSelect: true,
- value: ['sat'],
+ xtype: 'pmxDisplayEditField',
+ name: 'id',
+ fieldLabel: gettext('ID'),
+ renderer: Ext.htmlEncode,
allowBlank: false,
+ minLength: 4,
+ editable: me.isCreate,
},
+ nodesel,
+ storagesel,
{
- xtype: 'timefield',
- fieldLabel: gettext('Start Time'),
- name: 'starttime',
- format: 'H:i',
- formatText: 'HH:MM',
- value: '00:00',
+ xtype: 'pveCalendarEvent',
+ fieldLabel: gettext('Schedule'),
allowBlank: false,
+ name: 'schedule',
},
selModeField,
selPool,
@@ -390,7 +388,7 @@ Ext.define('PVE.dc.BackupEdit', {
success: function(response, options) {
let data = response.result.data;
- data.dow = data.dow.split(',');
+ data.dow = (data.dow || '').split(',');
if (data.all || data.exclude) {
if (data.exclude) {
@@ -532,6 +530,8 @@ Ext.define('PVE.dc.BackupView', {
delete job.starttime;
delete job.dow;
delete job.id;
+ delete job.schedule;
+ delete job.type;
delete job.node;
job.all = job.all === true ? 1 : 0;
@@ -714,6 +714,10 @@ Ext.define('PVE.dc.BackupView', {
disabledCls: 'x-item-enabled',
stopSelection: false,
},
+ {
+ header: gettext('ID'),
+ dataIndex: 'id',
+ },
{
header: gettext('Node'),
width: 100,
@@ -727,17 +731,9 @@ Ext.define('PVE.dc.BackupView', {
},
},
{
- header: gettext('Day of week'),
- width: 200,
- sortable: false,
- dataIndex: 'dow',
- renderer: PVE.Utils.render_backup_days_of_week,
- },
- {
- header: gettext('Start Time'),
- width: 60,
- sortable: true,
- dataIndex: 'starttime',
+ header: gettext('Schedule'),
+ width: 150,
+ dataIndex: 'schedule',
},
{
header: gettext('Storage'),
diff --git a/www/manager6/dc/BackupJobDetail.js b/www/manager6/dc/BackupJobDetail.js
index b91cb1b7..19b3b1a3 100644
--- a/www/manager6/dc/BackupJobDetail.js
+++ b/www/manager6/dc/BackupJobDetail.js
@@ -184,14 +184,8 @@ Ext.define('PVE.dc.BackupInfo', {
},
{
xtype: 'displayfield',
- name: 'dow',
- fieldLabel: gettext('Day of week'),
- renderer: PVE.Utils.render_backup_days_of_week,
- },
- {
- xtype: 'displayfield',
- name: 'starttime',
- fieldLabel: gettext('Start Time'),
+ name: 'schedule',
+ fieldLabel: gettext('Schedule'),
},
{
xtype: 'displayfield',
--
2.30.2
next prev parent reply other threads:[~2021-11-08 13:08 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-08 13:07 [pve-devel] [PATCH cluster/manager v2] add scheduling daemon for pvesr + vzdump (and more) Dominik Csapak
2021-11-08 13:07 ` [pve-devel] [PATCH cluster v2 1/1] add 'jobs.cfg' to observed files Dominik Csapak
2021-11-09 17:18 ` [pve-devel] applied: " Thomas Lamprecht
2021-11-08 13:07 ` [pve-devel] [PATCH manager v2 1/6] replace systemd timer with pvescheduler daemon Dominik Csapak
2021-11-08 13:07 ` [pve-devel] [PATCH manager v2 2/6] add PVE/Jobs to handle VZDump jobs Dominik Csapak
2021-11-08 13:07 ` [pve-devel] [PATCH manager v2 3/6] pvescheduler: run jobs from jobs.cfg Dominik Csapak
2021-11-08 13:07 ` [pve-devel] [PATCH manager v2 4/6] api/backup: refactor string for all days Dominik Csapak
2021-11-08 13:07 ` [pve-devel] [PATCH manager v2 5/6] api/backup: handle new vzdump jobs Dominik Csapak
2021-11-08 13:07 ` Dominik Csapak [this message]
2021-11-09 14:17 ` [pve-devel] [PATCH cluster/manager v2] add scheduling daemon for pvesr + vzdump (and more) Dylan Whyte
2021-11-10 9:38 ` Dominik Csapak
2021-11-10 11:05 ` Thomas Lamprecht
2021-11-09 16:55 ` Aaron Lauterer
2021-11-10 20:42 ` [pve-devel] applied-series: " Thomas Lamprecht
2021-11-11 11:35 ` [pve-devel] " Fabian Ebner
2021-11-11 11:46 ` Dominik Csapak
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=20211108130758.160914-8-d.csapak@proxmox.com \
--to=d.csapak@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