Fix issue with blank timezone

The time zone was not supposed to be blank. This commit fixes that wrong behaviour. Fix: #54
diowa · Mar 17, 2017 · 1cf56ed · 1cf56ed
1 parent 3f93635
commit 1cf56ed
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -8,7 +8,7 @@ class ApplicationController < ActionController::Base
   before_action :check_banned, except: [:banned], if: :user_signed_in?
 
   around_action :localize_route
-  around_action :time_zone_from_user, if: :user_signed_in?
+  around_action :time_zone_from_user, if: -> { user_signed_in? && current_user.time_zone? }
 
   private
 

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -82,7 +82,7 @@ class User
   field :banned, type: Boolean, default: false
 
   validates :gender, inclusion: GENDER, allow_blank: true
-  validates :time_zone, inclusion: ActiveSupport::TimeZone.all.map(&:name), allow_blank: true
+  validates :time_zone, inclusion: ActiveSupport::TimeZone.all.map(&:name)
   validates :vehicle_avg_consumption, numericality: { greater_than: 0, less_than: 10 }, presence: true
 
   def age

diff --git a/app/views/users/settings.html.slim b/app/views/users/settings.html.slim
@@ -29,7 +29,7 @@
     fieldset
       legend= t('.application_settings')
       = f.input :locale, collection: I18n.available_locales.map { |locale| [t('lang_native_name', locale: locale), locale] }, disabled: I18n.available_locales.one?, wrapper: :horizontal_form
-      = f.input :time_zone, wrapper: :horizontal_form
+      = f.input :time_zone, wrapper: :horizontal_form, include_blank: false
       .form-group
         .col-sm-10.col-sm-offset-2
           = label_tag :notification_group, t('.send_email'), class: 'control-label'