From 1499c2bf747b81db44a9f23cf6d784fc033bff4d Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Mon, 3 Jul 2017 10:20:55 +0300
Subject: [PATCH] Fix User/Org default timezone bug (#8748)

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

* dashboard: hide UTC icon immediately after timezone changing
---
 public/app/features/dashboard/model.ts                 | 4 ++--
 public/app/features/dashboard/timepicker/timepicker.ts | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/app/features/dashboard/model.ts b/public/app/features/dashboard/model.ts
index cdb61ac4ad7..01c805694a6 100644
--- a/public/app/features/dashboard/model.ts
+++ b/public/app/features/dashboard/model.ts
@@ -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);
   }
diff --git a/public/app/features/dashboard/timepicker/timepicker.ts b/public/app/features/dashboard/timepicker/timepicker.ts
index 2cdfd7a77f6..bf3937f8322 100644
--- a/public/app/features/dashboard/timepicker/timepicker.ts
+++ b/public/app/features/dashboard/timepicker/timepicker.ts
@@ -56,6 +56,7 @@ export class TimePickerCtrl {
       if (moment.isMoment(timeRaw.to)) {
         timeRaw.to.local();
       }
+      this.isUtc = false;
     } else {
       this.isUtc = true;
     }