Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-09 06:55:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
takezoe
2013-06-21 18:27:59 +09:00
parent fbc9945eee b64164be54
commit 2548d5d274
4 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/model/Issue.scala
View File

@@ -18,9 +18,10 @@ object Issues extends Table[Issue]("ISSUE") {
def assignedUserName = column[String]("ASSIGNED_USER_NAME") def assignedUserName = column[String]("ASSIGNED_USER_NAME")
def title = column[String]("TITLE") def title = column[String]("TITLE")
def content = column[String]("CONTENT") def content = column[String]("CONTENT")
def closed = column[Boolean]("CLOSED")
def registeredDate = column[java.sql.Date]("REGISTERED_DATE") // TODO convert java.util.Date later def registeredDate = column[java.sql.Date]("REGISTERED_DATE") // TODO convert java.util.Date later
def updatedDate = column[java.sql.Date]("UPDATED_DATE") def updatedDate = column[java.sql.Date]("UPDATED_DATE")
def * = userName ~ repositoryName ~ issueId ~ openedUserName ~ milestoneId.? ~ assignedUserName.? ~ title ~ content.? ~ registeredDate ~ updatedDate <> (Issue, Issue.unapply _) def * = userName ~ repositoryName ~ issueId ~ openedUserName ~ milestoneId.? ~ assignedUserName.? ~ title ~ content.? ~ closed ~ registeredDate ~ updatedDate <> (Issue, Issue.unapply _)
} }
case class Issue( case class Issue(
@@ -32,5 +33,6 @@ case class Issue(
assignedUserName: Option[String], assignedUserName: Option[String],
title: String, title: String,
content: Option[String], content: Option[String],
closed: Boolean,
registeredDate: java.sql.Date, registeredDate: java.sql.Date,
updatedDate: java.sql.Date) updatedDate: java.sql.Date)

1
src/main/scala/service/IssuesService.scala
View File

@@ -31,6 +31,7 @@ trait IssuesService {
None, None,
title, title,
content, content,
false,
new java.sql.Date(System.currentTimeMillis), // TODO new java.sql.Date(System.currentTimeMillis), // TODO
new java.sql.Date(System.currentTimeMillis)) new java.sql.Date(System.currentTimeMillis))

41
src/main/twirl/issues/issue.scala.html
View File

@@ -5,23 +5,36 @@
@html.header("issues", repository) @html.header("issues", repository)
@issuestab("issues", repository) @issuestab("issues", repository)
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="pull-left"><a href="@path/@repository.owner/@repository.name/issues">&#8592; Back to issue list</a></li> <li class="pull-left"><a href="@path/@repository.owner/@repository.name/issues"><i class="icon-arrow-left"></i> Back to issue list</a></li>
<li class="pull-right">Issue #@issue.issueId</li> <li class="pull-right">Issue #@issue.issueId</li>
</ul> </ul>
<div class="box"> <div class="row-fluid">
<div class="box-content"> <div class="span10">
<div class="small"><a href="#">@issue.openedUserName</a> opened this issue <time title="2013-06-03 15:56:05">TODO June 03, 2013</time></div> <div class="box">
<h4>@issue.title</h4> <div class="box-content">
<div class="small"><a href="#">@issue.openedUserName</a> opened this issue <time title="2013-06-03 15:56:05">TODO June 03, 2013</time></div>
<h4>@issue.title</h4>
</div>
<div class="box-content" style="background-color: #f5f5f5;">
@markdown(issue.content getOrElse "No description given.", repository, false, true, true)
</div>
</div>
<div class="box">
<div class="box-content">
@html.preview(repository, "", false, true, true, "width: 730px; height: 100px;")
</div>
</div>
<input type="submit" class="btn btn-success" value="Comment"/>
</div> </div>
<div class="box-content" style="background-color: #f5f5f5;"> <div class="span2">
@markdown(issue.content getOrElse "No description given.", repository, false, true, true) @if(issue.closed) {
<div class="label label-important">Closed</div>
} else {
<div class="label label-success">Open</div>
}
<div class="small">3 comments</div>
<hr/>
<strong>Labels</strong>
</div> </div>
</div> </div>
<div class="box">
<div class="box-content">
@html.preview(repository, "Leave a comment", false, true, true)
</div>
</div>
<input type="submit" class="btn btn-success" value="Comment"/>
} }

2
src/main/twirl/issues/issueedit.scala.html
View File

@@ -38,7 +38,7 @@
</li> </li>
</ul> </ul>
*@ *@
@html.preview(repository, "Leave a comment", false, true, true, "width: 650px; height: 200px;") @html.preview(repository, "", false, true, true, "width: 650px; height: 200px;")
</div> </div>
</div> </div>
<input type="submit" class="btn btn-success" value="Submit new issue"/> <input type="submit" class="btn btn-success" value="Submit new issue"/>