Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-08 14:35:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #630) Fix bug on changing issues status.

Browse Source
This commit is contained in:
Shintaro Murakami
2015-02-23 02:41:56 +09:00
parent 196890b26f
commit 377bc2703b
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/scala/app/IssuesController.scala
View File

@@ -331,7 +331,7 @@ trait IssuesControllerBase extends ControllerBase {
defining(repository.owner, repository.name){ case (owner, name) => defining(repository.owner, repository.name){ case (owner, name) =>
val userName = context.loginAccount.get.userName val userName = context.loginAccount.get.userName
getIssue(owner, name, issueId.toString) map { issue => getIssue(owner, name, issueId.toString) flatMap { issue =>
val (action, recordActivity) = val (action, recordActivity) =
getAction(issue) getAction(issue)
.collect { .collect {
@@ -346,11 +346,10 @@ trait IssuesControllerBase extends ControllerBase {
} }
.getOrElse(None -> None) .getOrElse(None -> None)
val commentId = content val commentId = (content, action) match {
.map ( _ -> action.map( _ + "_comment" ).getOrElse("comment") ) case (None, None) => None
.getOrElse ( action.get.capitalize -> action.get ) case (None, Some(action)) => Some(createComment(owner, name, userName, issueId, action.capitalize, action))
match { case (Some(content), _) => Some(createComment(owner, name, userName, issueId, content, action.map(_+ "_comment").getOrElse("comment")))
case (content, action) => createComment(owner, name, userName, issueId, content, action)
} }
// record comment activity if comment is entered // record comment activity if comment is entered
@@ -371,7 +370,7 @@ trait IssuesControllerBase extends ControllerBase {
content foreach { content foreach {
f.toNotify(repository, issueId, _){ f.toNotify(repository, issueId, _){
Notifier.msgComment(s"${context.baseUrl}/${owner}/${name}/${ Notifier.msgComment(s"${context.baseUrl}/${owner}/${name}/${
if(issue.isPullRequest) "pull" else "issues"}/${issueId}#comment-${commentId}") if(issue.isPullRequest) "pull" else "issues"}/${issueId}#comment-${commentId.get}")
} }
} }
action foreach { action foreach {
@@ -381,7 +380,7 @@ trait IssuesControllerBase extends ControllerBase {
} }
} }
issue -> commentId commentId.map( issue -> _ )
} }
} }
} }