IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14831 from grafana/fix/time-range-overrides

Browse Source 
Fix panel time overrides not being applied fully
This commit is contained in:
Torkel Ödegaard 2019-01-11 09:38:15 +01:00 committed by GitHub
commit 11ad92c08e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/app/features/dashboard/utils/panel.ts
View File

@ -143,12 +143,9 @@ export function applyPanelTimeOverrides(panel: PanelModel, timeRange: TimeRange)
const timeShift = '-' + timeShiftInterpolated; const timeShift = '-' + timeShiftInterpolated;
newTimeData.timeInfo += ' timeshift ' + timeShift; newTimeData.timeInfo += ' timeshift ' + timeShift;
newTimeData.timeRange = { newTimeData.timeRange = {
from: dateMath.parseDateMath(timeShift, timeRange.from, false), from: dateMath.parseDateMath(timeShift, newTimeData.timeRange.from, false),
to: dateMath.parseDateMath(timeShift, timeRange.to, true), to: dateMath.parseDateMath(timeShift, newTimeData.timeRange.to, true),
raw: { raw: newTimeData.timeRange.raw,
from: timeRange.from,
to: timeRange.to,
},
}; };
} }