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

manager6: web-syslog: add date span selection

Browse Source 
This is the ExtJS 6 version from commit
59e6da2d44

Same code as there.
A issue with the date picker which can be triggered by scrolling up
and then selecting a date will be fixed in ExtJS 6.0.2 (not yet
released), a workaround is in the next patch.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2016-03-15 10:55:46 +01:00 committed by Dietmar Maurer
parent 9a55d9a21a
commit 561312ff62
2 changed files with 76 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
www/manager6/node/Config.js
View File

@ -160,7 +160,8 @@ Ext.define('PVE.node.Config', {
title: 'Syslog', title: 'Syslog',
itemId: 'syslog', itemId: 'syslog',
xtype: 'pveLogView', xtype: 'pveLogView',
url: "/api2/extjs/nodes/" + nodename + "/syslog" url: "/api2/extjs/nodes/" + nodename + "/syslog",
log_select_timespan: 1
} }
); );
} }

77
www/manager6/panel/LogView.js
View File

@ -73,12 +73,20 @@ Ext.define('PVE.panel.LogView', {
doAttemptLoad: function(start) { doAttemptLoad: function(start) {
var me = this; var me = this;
var req_params = {
start: start,
limit: me.pageSize
};
if (me.log_select_timespan) {
// always show log until the end of the selected day
req_params.until = Ext.Date.format(me.until_date, 'Y-m-d') + ' 23:59:59';
req_params.since = Ext.Date.format(me.since_date, 'Y-m-d');
}
PVE.Utils.API2Request({ PVE.Utils.API2Request({
url: me.url, url: me.url,
params: { params: req_params,
start: start,
limit: me.pageSize
},
method: 'GET', method: 'GET',
success: function(response) { success: function(response) {
PVE.Utils.setErrorMask(me, false); PVE.Utils.setErrorMask(me, false);
@ -169,6 +177,11 @@ Ext.define('PVE.panel.LogView', {
throw "no url specified"; throw "no url specified";
} }
// show logs from today back to 3 days ago per default
me.until_date = new Date();
me.since_date = new Date();
me.since_date.setDate(me.until_date.getDate() - 3);
me.dataCmp = Ext.create('Ext.Component', { me.dataCmp = Ext.create('Ext.Component', {
style: 'font:normal 11px tahoma, arial, verdana, sans-serif;' + style: 'font:normal 11px tahoma, arial, verdana, sans-serif;' +
'line-height: ' + me.lineHeight.toString() + 'px; white-space: pre;' 'line-height: ' + me.lineHeight.toString() + 'px; white-space: pre;'
@ -199,6 +212,62 @@ Ext.define('PVE.panel.LogView', {
} }
}); });
if (me.log_select_timespan) {
me.tbar = ['->','Since: ',
{
xtype: 'datefield',
maxValue: me.until_date,
value: me.since_date,
name: 'since_date',
format: 'Y-m-d',
listeners: {
select: function(field, date) {
me.since_date_selected = date;
var until_field = field.up().down('field[name=until_date]');
if (date > until_field.getValue()) {
until_field.setValue(date);
}
}
}
},
'Until: ',
{
xtype: 'datefield',
maxValue: me.until_date,
value: me.until_date,
name: 'until_date',
format: 'Y-m-d',
listeners: {
select: function(field, date) {
var since_field = field.up().down('field[name=since_date]');
if (date < since_field.getValue()) {
since_field.setValue(date);
}
}
}
},
{
xtype: 'button',
text: 'Update',
handler: function() {
var until_field = me.down('field[name=until_date]');
var since_field = me.down('field[name=since_date]');
if (until_field.getValue() < since_field.getValue()) {
Ext.Msg.alert('Error',
'Since date must be less equal than Until date.');
until_field.setValue(me.until_date);
since_field.setValue(me.since_date);
} else {
me.until_date = until_field.getValue();
me.since_date = since_field.getValue();
me.requestUpdate();
}
}
}
];
}
me.callParent(); me.callParent();
} }
}); });