From cb450b1cd45e408efe245a8f99546a5ec4f8a8cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Van=C3=AD=C4=8Dek?= Date: Fri, 24 Mar 2023 22:05:40 +0100 Subject: [PATCH] FIX workload patchfile --- patches/workload_module.patch | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/patches/workload_module.patch b/patches/workload_module.patch index 8044463..b39e78f 100644 --- a/patches/workload_module.patch +++ b/patches/workload_module.patch @@ -162,8 +162,8 @@ + +end \ No newline at end of file ---- a/plugins/redmine_workload/lib/redmine_workload/app/controllers/wl_national_holiday_controller.rb -+++ b/plugins/redmine_workload/lib/redmine_workload/app/controllers/wl_national_holiday_controller.rb +--- a/plugins/redmine_workload/app/controllers/wl_national_holiday_controller.rb ++++ b/plugins/redmine_workload/app/controllers/wl_national_holiday_controller.rb @@ -3,7 +3,7 @@ require 'json' @@ -173,8 +173,8 @@ before_action :authorize_global, only: %i[create update destroy] before_action :find_user_workload_data ---- a/plugins/redmine_workload/lib/redmine_workload/app/controllers/wl_user_datas_controller.rb -+++ b/plugins/redmine_workload/lib/redmine_workload/app/controllers/wl_user_datas_controller.rb +--- a/plugins/redmine_workload/app/controllers/wl_user_datas_controller.rb ++++ b/plugins/redmine_workload/app/controllers/wl_user_datas_controller.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true @@ -184,8 +184,8 @@ helper :workloads helper :wl_user_datas ---- a/plugins/redmine_workload/lib/redmine_workload/app/controllers/wl_user_vacations_controller.rb -+++ b/plugins/redmine_workload/lib/redmine_workload/app/controllers/wl_user_vacations_controller.rb +--- a/plugins/redmine_workload/app/controllers/wl_user_vacations_controller.rb ++++ b/plugins/redmine_workload/app/controllers/wl_user_vacations_controller.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true @@ -195,8 +195,8 @@ helper :workloads ---- a/plugins/redmine_workload/lib/redmine_workload/app/controllers/workloads_controller.rb -+++ b/plugins/redmine_workload/lib/redmine_workload/app/controllers/workloads_controller.rb +--- a/plugins/redmine_workload/app/controllers/workloads_controller.rb ++++ b/plugins/redmine_workload/app/controllers/workloads_controller.rb @@ -11,7 +11,7 @@ class WorkloadsController < ApplicationController helper :workloads @@ -206,8 +206,8 @@ include WorkloadsHelper before_action :authorize_global, only: %i[index] ---- a/plugins/redmine_workload/lib/redmine_workload/app/models/user_workload.rb -+++ b/plugins/redmine_workload/lib/redmine_workload/app/models/user_workload.rb +--- a/plugins/redmine_workload/app/models/user_workload.rb ++++ b/plugins/redmine_workload/app/models/user_workload.rb @@ -6,8 +6,8 @@ # class UserWorkload @@ -219,8 +219,8 @@ attr_reader :assignees, :issues, :time_span, :today ---- a/plugins/redmine_workload/lib/redmine_workload/app/models/wl_default_user_data.rb -+++ b/plugins/redmine_workload/lib/redmine_workload/app/models/wl_default_user_data.rb +--- a/plugins/redmine_workload/app/models/wl_default_user_data.rb ++++ b/plugins/redmine_workload/app/models/wl_default_user_data.rb @@ -4,7 +4,7 @@ # Holds default user related data for workload calculation. # @@ -230,8 +230,8 @@ def threshold_lowload_min default_attributes[:threshold_lowload_min].to_f ---- a/plugins/redmine_workload/lib/redmine_workload/app/models/wl_user_data.rb -+++ b/plugins/redmine_workload/lib/redmine_workload/app/models/wl_user_data.rb +--- a/plugins/redmine_workload/app/models/wl_user_data.rb ++++ b/plugins/redmine_workload/app/models/wl_user_data.rb @@ -4,7 +4,7 @@ # Holds user related data for workload calculation. #