diff --git a/app/controllers/clockwork_web/home_controller.rb b/app/controllers/clockwork_web/home_controller.rb index a0a5697..20dbe82 100644 --- a/app/controllers/clockwork_web/home_controller.rb +++ b/app/controllers/clockwork_web/home_controller.rb @@ -3,7 +3,7 @@ class HomeController < ActionController::Base layout false helper ClockworkWeb::HomeHelper - http_basic_authenticate_with name: ENV["CLOCKWORK_USERNAME"], password: ENV["CLOCKWORK_PASSWORD"] if ENV["CLOCKWORK_PASSWORD"] + http_basic_authenticate_with name: ENV['CLOCKWORK_USERNAME'], password: ENV['CLOCKWORK_PASSWORD'] if ENV['CLOCKWORK_PASSWORD'] def index @events = @@ -19,12 +19,12 @@ def index @last_runs = ClockworkWeb.last_runs @disabled = ClockworkWeb.disabled_jobs - @last_heartbeat = ClockworkWeb.last_heartbeat + @last_heartbeat = ClockworkWeb.last_heartbeat.in_time_zone end def job job = params[:job] - enable = params[:enable] == "true" + enable = params[:enable] == 'true' if enable ClockworkWeb.enable(job) else diff --git a/app/helpers/clockwork_web/home_helper.rb b/app/helpers/clockwork_web/home_helper.rb index 588f5ae..5f2757c 100644 --- a/app/helpers/clockwork_web/home_helper.rb +++ b/app/helpers/clockwork_web/home_helper.rb @@ -3,9 +3,9 @@ module HomeHelper def friendly_period(period) if period % 1.day == 0 - pluralize(period / 1.day, "day") + pluralize(period / 1.day, 'day') elsif period % 1.hour == 0 - pluralize(period / 1.hour, "hour") + pluralize(period / 1.hour, 'hour') elsif period % 1.minute == 0 "#{period / 1.minute} min" else @@ -14,17 +14,11 @@ def friendly_period(period) end def last_run(time) - if time - time_ago_in_words(time) - end + time && time_ago_in_words(time.in_time_zone) end def friendly_time_part(time_part) - if time_part - time_part.to_s.rjust(2, "0") - else - "**" - end + time_part ? time_part.to_s.rjust(2, '0') : '**' end end diff --git a/app/views/clockwork_web/home/index.html.erb b/app/views/clockwork_web/home/index.html.erb index 6eec8ff..d1bb41d 100644 --- a/app/views/clockwork_web/home/index.html.erb +++ b/app/views/clockwork_web/home/index.html.erb @@ -82,7 +82,7 @@
<% @events.each do |event| %> <% enabled = !@disabled.include?(event.job) %> -