Skip to content
This repository has been archived by the owner on Jan 19, 2019. It is now read-only.

compatibility 3.4.6 and exclusion of issues < 100% #56

Open
wants to merge 1 commit into
base: redmine-2.x
Choose a base branch
from
Open

compatibility 3.4.6 and exclusion of issues < 100% #56

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions app/models/reminder_mailer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,21 @@ def due_date_notification(user, projects)
def self.find_issues
if Redmine::VERSION::MAJOR >= 3
scope = Issue.where(
"(#{Issue.table_name}.assigned_to_id IS NOT NULL OR #{Issue.table_name}.rpr_project_responsible_id IS NOT NULL)" +
"#{Issue.table_name}.assigned_to_id IS NOT NULL" +
" AND #{Project.table_name}.status = #{Project::STATUS_ACTIVE}" +
" AND #{Issue.table_name}.due_date IS NOT NULL" +
" AND #{Issue.table_name}.done_ratio < 100" +
" AND #{User.table_name}.status = #{User::STATUS_ACTIVE}"
)
issues = scope.joins(:status, :assigned_to, :project, :tracker).to_a
issues.reject! { |issue| not (issue.remind? or issue.overdue?) }
issues.sort! { |first, second| first.due_date <=> second.due_date }
else
scope = Issue.open.scoped(:conditions => [
"(#{Issue.table_name}.assigned_to_id IS NOT NULL OR #{Issue.table_name}.rpr_project_responsible_id IS NOT NULL)" +
"#{Issue.table_name}.assigned_to_id IS NOT NULL" +
" AND #{Project.table_name}.status = #{Project::STATUS_ACTIVE}" +
" AND #{Issue.table_name}.due_date IS NOT NULL" +
" AND #{Issue.table_name}.done_ratio < 100" +
" AND #{User.table_name}.status = #{User::STATUS_ACTIVE}"
])
issues = scope.all(:include => [:status, :assigned_to, :project, :tracker])
Expand Down