Workload SQL keyword patch.
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
@@ -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; \
|
||||
|
||||
11
patches/workload_sql.patch
Normal file
11
patches/workload_sql.patch
Normal 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)
|
||||
Reference in New Issue
Block a user