Merge pull request Restream#3 from royyeh22/royyeh22-patch-3

reminders[issue.assigned_to] shall contain only issues with due set
acosonic · Jul 28, 2017 · 8d99327 · 8d99327
2 parents a6b5287 + 87495ab
commit 8d99327
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/redmine_reminder/collector.rb b/lib/redmine_reminder/collector.rb
@@ -26,7 +26,7 @@ def collect_reminders
         reminders[issue.author][:author] << issue
       end
 
-      if options.send_to_assigned_to? && issue.assigned_to
+      if options.send_to_assigned_to? && issue.assigned_to && issue.due_date
         reminders[issue.assigned_to] ||=
             RedmineReminder::Reminder.new(issue.assigned_to)
         reminders[issue.assigned_to][:assigned_to] << issue
@@ -92,7 +92,7 @@ def issues_due_in_days(use_due_day = true)
     end
 
     scope.where(sql_condition.conditions).
-        order("#{Issue.table_name}.due_date, #{Project.table_name}.name")
+        order("#{Project.table_name}.name, #{Issue.table_name}.due_date")
   end
 
   def issue_statuses