From 3fc589f8751ef5ec20777b81a3539c111a385999 Mon Sep 17 00:00:00 2001 From: Gerhard Schlager Date: Fri, 17 Jan 2020 22:34:18 +0100 Subject: [PATCH] FIX: Don't override timezone on every visit of profile preferences The timezone should only be initialized when there is no timezone stored in the DB yet. This also fixes an error that happened in dev mode whenever you switch between user preference tabs. --- .../javascripts/discourse/routes/preferences-profile.js.es6 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/routes/preferences-profile.js.es6 b/app/assets/javascripts/discourse/routes/preferences-profile.js.es6 index 7b794ef681b..b56f1d7d786 100644 --- a/app/assets/javascripts/discourse/routes/preferences-profile.js.es6 +++ b/app/assets/javascripts/discourse/routes/preferences-profile.js.es6 @@ -3,8 +3,10 @@ import RestrictedUserRoute from "discourse/routes/restricted-user"; export default RestrictedUserRoute.extend({ showFooter: true, setupController(controller, model) { - model.user_option.timezone = - model.user_option.timezone || moment.tz.guess(); + if (!model.user_option.timezone) { + Ember.set(model, "user_option.timezone", moment.tz.guess()); + } + controller.set("model", model); } });