Workload SQL keyword patch.
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
2023-03-24 23:45:11 +01:00
parent 3402e55901
commit 56c914b56f
2 changed files with 12 additions and 0 deletions

View File

@@ -19,6 +19,7 @@ RUN set -eux; \
rm -f /etc/cron.d/*; \
# Apply patches
git apply project_identifier.patch; \
git apply workload_sql.patch; \
git apply workload_module.patch; \
mv plugins/redmine_workload/lib/redmine_workload/hooks/plugin.rb plugins/redmine_workload/lib/redmine_workload/hooks/after_plugins_loaded_hook.rb; \
rm *.patch; \

View File

@@ -0,0 +1,11 @@
--- a/plugins/redmine_workload/lib/redmine_workload/wl_date_tools.rb
+++ b/plugins/redmine_workload/lib/redmine_workload/wl_date_tools.rb
@@ -76,7 +76,7 @@ class WlDateTools
end
def self.holiday?(day)
- !WlNationalHoliday.where('start <= ? AND end >= ?', day, day).empty?
+ !WlNationalHoliday.where('start <= ? AND "end" >= ?', day, day).empty?
end
def self.vacation?(day, assignee)