proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-15 11:32:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ui: dc/backup: show id+schedule instead of dow+starttime

Browse Source 
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>
This commit is contained in:
Dominik Csapak 2021-11-08 14:07:58 +01:00 committed by Thomas Lamprecht
parent 305921b1ab
commit 20d15804f6
2 changed files with 24 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
www/manager6/dc/Backup.js
View File

@ -176,24 +176,22 @@ Ext.define('PVE.dc.BackupEdit', {
});
let column1 = [
{
xtype: 'pmxDisplayEditField',
name: 'id',
fieldLabel: gettext('ID'),
renderer: Ext.htmlEncode,
allowBlank: false,
minLength: 4,
editable: me.isCreate,
},
nodesel,
storagesel,
{
xtype: 'pveDayOfWeekSelector',
name: 'dow',
fieldLabel: gettext('Day of week'),
multiSelect: true,
value: ['sat'],
allowBlank: false,
},
{
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'),

10
www/manager6/dc/BackupJobDetail.js
View File

@ -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',