From a6dd577b4e4aec9b2b25c04f173241f6165166a6 Mon Sep 17 00:00:00 2001 From: mlorb Date: Wed, 8 Aug 2018 11:43:18 +0200 Subject: [PATCH] fix time zone selector --- .../javascripts/users/settings/account/preferences/index.js | 1 + app/views/users/settings/account/preferences/index.html.erb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/users/settings/account/preferences/index.js b/app/assets/javascripts/users/settings/account/preferences/index.js index dcb687789..b769daf0d 100644 --- a/app/assets/javascripts/users/settings/account/preferences/index.js +++ b/app/assets/javascripts/users/settings/account/preferences/index.js @@ -8,6 +8,7 @@ */ function toggleFormVisibility(form, edit) { if (edit) { + form.find('.selectpicker').selectpicker(); form.find("[data-part='view']").hide(); form.find("[data-part='edit']").show(); form.find("[data-part='edit'] input:not([type='file']):not([type='submit']):first").focus(); diff --git a/app/views/users/settings/account/preferences/index.html.erb b/app/views/users/settings/account/preferences/index.html.erb index 6b7942041..89ab57ffe 100644 --- a/app/views/users/settings/account/preferences/index.html.erb +++ b/app/views/users/settings/account/preferences/index.html.erb @@ -39,7 +39,7 @@
<%= f.select :time_zone, ActiveSupport::TimeZone.all.collect { |tz| [tz.formatted_offset + " " + tz.name, tz.name] - }, {}, {class: 'form-control selectpicker', 'ata-role' => 'clear'} %> + }, {}, {class: 'form-control selectpicker', 'data-role': 'clear'} %> <%= t("users.settings.account.preferences.edit.time_zone_sublabel") %>