Commit f026be37 by Torkel Ödegaard

fix case where timeshift and time override is used

parent f274195d
...@@ -140,7 +140,7 @@ export const applyPanelTimeOverrides = ( ...@@ -140,7 +140,7 @@ export const applyPanelTimeOverrides = (
} }
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, timeRange.from, false),
to: dateMath.parseDateMath(timeShift, timeRange.to, true), to: dateMath.parseDateMath(timeShift, timeRange.to, true),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment