proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-05-25 12:36:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rrd display : avoid 2 refresh

Browse Source 
Currently when we open a new summary panel

- we display the rrd with default hour timeframe
- then we refresh it
- then we update from timeframe selector

With this patch:
- We display the rrd with timeframe from selector, or if not defined default hour
- We update from timeframe selector value if timeframe && cf are differents from current value

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier 2013-06-11 11:12:58 +02:00 committed by Dietmar Maurer
parent a49706cb78
commit 493a85a268
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
www/manager/panel/RRDView.js
View File

@ -5,14 +5,6 @@ Ext.define('PVE.panel.RRDView', {
initComponent : function() {
var me = this;
if (!me.timeframe) {
me.timeframe = 'hour';
}
if (!me.rrdcffn) {
me.rrdcffn = 'AVERAGE';
}
if (!me.datasource) {
throw "no datasource specified";
}
@ -21,6 +13,27 @@ Ext.define('PVE.panel.RRDView', {
throw "no rrdurl specified";
}
var stateid = 'pveRRDTypeSelection';
var sp = Ext.state.Manager.getProvider();
var stateinit = sp.get(stateid);
if (!me.timeframe) {
if(stateinit.timeframe){
me.timeframe = stateinit.timeframe;
}else{
me.timeframe = 'hour';
}
}
if (!me.rrdcffn) {
if(stateinit.rrdcffn){
me.rrdcffn = stateinit.cf;
}else{
me.rrdcffn = 'AVERAGE';
}
}
var datasource = me.datasource;
// fixme: dcindex??
@ -33,7 +46,6 @@ Ext.define('PVE.panel.RRDView', {
return url;
};
var stateid = 'pveRRDTypeSelection';
Ext.apply(me, {
layout: 'fit',
@ -45,9 +57,11 @@ Ext.define('PVE.panel.RRDView', {
},
applyState : function(state) {
if (state && state.id) {
me.timeframe = state.timeframe;
me.rrdcffn = state.cf;
me.reload_task.delay(10);
if(state.timeframe !== me.timeframe || state.cf !== me.rrdcffn){
me.timeframe = state.timeframe;
me.rrdcffn = state.cf;
me.reload_task.delay(10);
}
}
}
});
@ -80,9 +94,6 @@ Ext.define('PVE.panel.RRDView', {
me.reload_task.cancel();
});
var sp = Ext.state.Manager.getProvider();
me.applyState(sp.get(stateid));
var state_change_fn = function(prov, key, value) {
if (key == stateid) {
me.applyState(value);