From ba3cbfbead73be1c0250552fbf211c03c2348630 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nick=20Fl=C3=BCckiger?= Date: Thu, 6 May 2021 17:02:53 +0200 Subject: [PATCH] Fix pathing an smaller linting (#25) --- app/services/issue_connector.rb | 12 +++++++----- app/services/settings_manager.rb | 5 +++++ app/views/settings/_redmine_tracky_settings.erb | 8 ++++++++ config/routes.rb | 5 ++--- init.rb | 6 +++--- 5 files changed, 25 insertions(+), 11 deletions(-) diff --git a/app/services/issue_connector.rb b/app/services/issue_connector.rb index e13cbf11..419f8b3e 100644 --- a/app/services/issue_connector.rb +++ b/app/services/issue_connector.rb @@ -10,6 +10,13 @@ def initialize(issues, timer_session) @errors = [] end + def run + validate_issues + create_connections + end + + private + def validate_issues issues_exist? end @@ -25,11 +32,6 @@ def issues_exist? @errors.count.zero? end - def run - validate_issues - create_connections - end - def create_connections return false unless @errors.count.zero? diff --git a/app/services/settings_manager.rb b/app/services/settings_manager.rb index f24e4869..84526f07 100644 --- a/app/services/settings_manager.rb +++ b/app/services/settings_manager.rb @@ -4,6 +4,7 @@ class SettingsManager DEFAULT_HOUR_FORMAT_PRECISION = 2 DEFAULT_MAX_HOURS_PER_SESSION = 24 DEFAULT_MAX_HOURS_PER_DAY = 24 + DEFAULT_VISIBLE_HINTS = true class << self def rounding_for_displayed_hours @@ -18,6 +19,10 @@ def max_hours_recorded_per_session settings_object['max_hours_recorded_per_session'] || DEFAULT_MAX_HOURS_PER_SESSION end + def visible_hints + settings_object['visible_hints'] || DEFAULT_VISIBLE_HINTS + end + def settings_object Setting['plugin_redmine_tracky'] end diff --git a/app/views/settings/_redmine_tracky_settings.erb b/app/views/settings/_redmine_tracky_settings.erb index f33fca1c..73b8f56a 100644 --- a/app/views/settings/_redmine_tracky_settings.erb +++ b/app/views/settings/_redmine_tracky_settings.erb @@ -24,5 +24,13 @@ name="settings[max_hours_recorded_per_session]" > + + <%= t('timer_sessions.settings.displayed_hours_rounding') %> + + + + diff --git a/config/routes.rb b/config/routes.rb index 59d8e36c..025d9c55 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,11 +2,10 @@ # Plugin's routes # See: http://guides.rubyonrails.org/routing.htm -resources :timer_sessions, only: %i[index edit update patch destroy] do - get 'time_error', to: 'timer_sessions#time_error', as: :timer_sessions_time_error -end +resources :timer_sessions, only: %i[index edit update patch destroy] get 'timer_sessions_report', to: 'timer_sessions#report', as: :timer_sessions_report +get 'timer_sessions_time_error/:id', to: 'timer_sessions#time_error', as: :timer_sessions_time_error post 'time_tracker/start', to: 'time_tracker#start', as: :start_time_tracker post 'time_tracker/stop', to: 'time_tracker#stop', as: :stop_time_tracker diff --git a/init.rb b/init.rb index 38ed768c..46cfd3c0 100644 --- a/init.rb +++ b/init.rb @@ -23,7 +23,8 @@ default_settings = { 'displayed_hours_rounding' => 2, 'max_hours_recorded_per_day' => 24, - 'max_hours_recorded_per_session' => 24 + 'max_hours_recorded_per_session' => 24, + 'visible_hints' => true } settings default: default_settings, partial: 'settings/redmine_tracky_settings' @@ -35,7 +36,6 @@ caption: 'TimerSessions' project_module :timer_sessions do - permission :manage_timer_sessions, { timer_sessions: %i[index create update edit patch destroy report time_error report time_error], time_tracker: %i[start stop update] @@ -63,6 +63,6 @@ permission :delete_timer_sessions,{ timer_sessions: %i[destroy], - },require: :loggedin + }, require: :loggedin end end