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

Fix User/Org default timezone bug (#8748)

Browse Source 
* dashboard: don't override timezone if default selected, issue #8503

* dashboard: hide UTC icon immediately after timezone changing
This commit is contained in:
Alexander Zobnin 2017-07-03 10:20:55 +03:00 committed by Torkel Ödegaard
parent b8aa203707
commit 1499c2bf74
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/features/dashboard/model.ts
View File

@ -247,9 +247,9 @@ export class DashboardModel {
formatDate(date, format?) {
date = moment.isMoment(date) ? date : moment(date);
format = format || 'YYYY-MM-DD HH:mm:ss';
this.timezone = this.getTimezone();
let timezone = this.getTimezone();
return this.timezone === 'browser' ?
return timezone === 'browser' ?
moment(date).format(format) :
moment.utc(date).format(format);
}

1
public/app/features/dashboard/timepicker/timepicker.ts
View File

@ -56,6 +56,7 @@ export class TimePickerCtrl {
if (moment.isMoment(timeRaw.to)) {
timeRaw.to.local();
}
this.isUtc = false;
} else {
this.isUtc = true;
}