From 3cc7bd3cdbda845e41429fa24d88d4e87f592910 Mon Sep 17 00:00:00 2001 From: Piotr Adamski Date: Sun, 1 Dec 2013 14:09:25 +0100 Subject: [PATCH] #217 open milestones sorted by due date ascending, closed milestones sorted by close date descending --- src/main/scala/service/MilestonesService.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/service/MilestonesService.scala b/src/main/scala/service/MilestonesService.scala index 01160c36c..1a702afc7 100644 --- a/src/main/scala/service/MilestonesService.scala +++ b/src/main/scala/service/MilestonesService.scala @@ -31,7 +31,7 @@ trait MilestonesService { def getMilestonesWithIssueCount(owner: String, repository: String): List[(Milestone, Int, Int)] = { val counts = Issues - .filter { t => (t.byRepository(owner, repository)) && (t.milestoneId isNotNull) } + .filter { t => t.byRepository(owner, repository) && (t.milestoneId isNotNull) } .groupBy { t => t.milestoneId ~ t.closed } .map { case (t1, t2) => (t1._1 ~ t1._2) -> t2.length } .toMap @@ -42,5 +42,5 @@ trait MilestonesService { } def getMilestones(owner: String, repository: String): List[Milestone] = - Query(Milestones).filter(_.byRepository(owner, repository)).sortBy(_.milestoneId asc).list + Query(Milestones).filter(_.byRepository(owner, repository)).sortBy(_.dueDate.asc).sortBy(_.closedDate.desc).list }