From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com, Dominik Csapak <d.csapak@proxmox.com>
Subject: Re: [pve-devel] [PATCH manager 7/7] ui: dc/backup: show id+schedule instead of dow+starttime
Date: Wed, 3 Nov 2021 10:21:37 +0100 [thread overview]
Message-ID: <dda37bbf-4e3b-328d-bf39-b79630df4cb1@proxmox.com> (raw)
In-Reply-To: <20211007082727.1385888-9-d.csapak@proxmox.com>
Am 07.10.21 um 10:27 schrieb Dominik Csapak:
> we can now show the id (since its not autogenerated anymore),
But it's hidden below ;)
I get that the ID is not very telling for existing jobs, but for jobs
with user-chosen IDs it would allow to distinguish them more quickly.
> 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 | 47 ++++++++++++++----------------
> www/manager6/dc/BackupJobDetail.js | 10 ++-----
> 2 files changed, 24 insertions(+), 33 deletions(-)
>
> diff --git a/www/manager6/dc/Backup.js b/www/manager6/dc/Backup.js
> index adefc5f4..87b3d70a 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,11 @@ Ext.define('PVE.dc.BackupView', {
> disabledCls: 'x-item-enabled',
> stopSelection: false,
> },
> + {
> + header: gettext('ID'),
> + dataIndex: 'id',
> + hidden: true
Here (also misses trailing comma).
> + },
> {
> header: gettext('Node'),
> width: 100,
> @@ -727,17 +732,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',
>
prev parent reply other threads:[~2021-11-03 9:21 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-07 8:27 [pve-devel] [PATCH cluster/manager] add scheduling daemon for pvesr + vzdump (and more) Dominik Csapak
2021-10-07 8:27 ` [pve-devel] [PATCH cluster 1/1] add 'jobs.cfg' to observed files Dominik Csapak
2021-10-07 8:27 ` [pve-devel] [PATCH manager 1/7] replace systemd timer with pvescheduler daemon Dominik Csapak
2021-10-29 12:05 ` Fabian Ebner
2021-11-02 9:26 ` Dominik Csapak
2021-10-07 8:27 ` [pve-devel] [PATCH manager 2/7] postinst: use reload-or-restart instead of reload-or-try-restart Dominik Csapak
2021-10-07 8:38 ` [pve-devel] applied: " Thomas Lamprecht
2021-10-07 8:27 ` [pve-devel] [PATCH manager 3/7] api/backup: refactor string for all days Dominik Csapak
2021-10-07 8:27 ` [pve-devel] [PATCH manager 4/7] add PVE/Jobs to handle VZDump jobs Dominik Csapak
2021-11-02 13:52 ` Fabian Ebner
2021-11-02 14:33 ` Dominik Csapak
2021-11-03 7:37 ` Fabian Ebner
2021-10-07 8:27 ` [pve-devel] [PATCH manager 5/7] pvescheduler: run jobs from jobs.cfg Dominik Csapak
2021-10-07 8:27 ` [pve-devel] [PATCH manager 6/7] api/backup: handle new vzdump jobs Dominik Csapak
2021-11-03 9:05 ` Fabian Ebner
2021-10-07 8:27 ` [pve-devel] [PATCH manager 7/7] ui: dc/backup: show id+schedule instead of dow+starttime Dominik Csapak
2021-11-03 9:21 ` Fabian Ebner [this message]
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=dda37bbf-4e3b-328d-bf39-b79630df4cb1@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=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