Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-01-08 16:42:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1540 from dbronecki/fix-1481

Browse Source 
Fixes #1481
This commit is contained in:
Naoki Takezoe
2017-04-14 08:28:54 +09:00
committed by GitHub
parent f40bdb6494 ed543847a8
commit 71737eb018
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/scala/gitbucket/core/model/Milestone.scala
View File

@@ -9,10 +9,10 @@ trait MilestoneComponent extends TemplateComponent { self: Profile =>
class Milestones(tag: Tag) extends Table[Milestone](tag, "MILESTONE") with MilestoneTemplate {
override val milestoneId = column[Int]("MILESTONE_ID", O AutoInc)
val title = column[String]("TITLE")
val description = column[String]("DESCRIPTION")
val dueDate = column[java.util.Date]("DUE_DATE")
val closedDate = column[java.util.Date]("CLOSED_DATE")
def * = (userName, repositoryName, milestoneId, title, description.?, dueDate.?, closedDate.?) <> (Milestone.tupled, Milestone.unapply)
val description = column[Option[String]]("DESCRIPTION")
val dueDate = column[Option[java.util.Date]]("DUE_DATE")
val closedDate = column[Option[java.util.Date]]("CLOSED_DATE")
def * = (userName, repositoryName, milestoneId, title, description, dueDate, closedDate) <> (Milestone.tupled, Milestone.unapply)
def byPrimaryKey(owner: String, repository: String, milestoneId: Int) = byMilestone(owner, repository, milestoneId)
def byPrimaryKey(userName: Rep[String], repositoryName: Rep[String], milestoneId: Rep[Int]) = byMilestone(userName, repositoryName, milestoneId)

2
src/main/scala/gitbucket/core/service/MilestonesService.scala
View File

@@ -21,7 +21,7 @@ trait MilestonesService {
def updateMilestone(milestone: Milestone)(implicit s: Session): Unit =
Milestones
.filter (t => t.byPrimaryKey(milestone.userName, milestone.repositoryName, milestone.milestoneId))
.map (t => (t.title, t.description.?, t.dueDate.?, t.closedDate.?))
.map (t => (t.title, t.description, t.dueDate, t.closedDate))
.update (milestone.title, milestone.description, milestone.dueDate, milestone.closedDate)
def openMilestone(milestone: Milestone)(implicit s: Session): Unit =