diff --git a/app/controllers/api/pm/dashboards_controller.rb b/app/controllers/api/pm/dashboards_controller.rb index afe03e01f..c45813f39 100644 --- a/app/controllers/api/pm/dashboards_controller.rb +++ b/app/controllers/api/pm/dashboards_controller.rb @@ -15,7 +15,8 @@ class Api::Pm::DashboardsController < Api::Pm::BaseController @issues = @issues.where(pm_project_id: pm_project_ids).joins(:issue_participants).where(issue_participants: {participant_id: current_user.id, participant_type: 'assigned'}) issues_1 = @issues.where(pm_issue_type: 1).where.not(status_id: [2,8]).to_sql issues_2 = @issues.where(pm_issue_type: [2,3]).where.not(status_id: [3,5,6]).to_sql - @issues = Issue.from("( #{issues_1} union #{issues_2}) as issues") + @issues = Issue.from("( #{issues_1} union #{issues_2}) as issues") + @issues = @issues.order(plan_end_date: :desc).order(created_on: :desc) @issues = kaminari_paginate(@issues.distinct.pm_includes) end