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

Return Ok at end of updating assignedUserName and milestoneId.

Browse Source
This commit is contained in:
takezoe
2013-07-02 21:09:30 +09:00
parent 997d460914
commit e6ae06e38c
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,7 @@ import jp.sf.amateras.scalatra.forms._
import service._ import service._
import IssuesService._ import IssuesService._
import util.UsersOnlyAuthenticator import util.UsersOnlyAuthenticator
import org.scalatra.Ok
class IssuesController extends IssuesControllerBase class IssuesController extends IssuesControllerBase
with IssuesService with RepositoryService with AccountService with LabelsService with MilestonesService with IssuesService with RepositoryService with AccountService with LabelsService with MilestonesService
@@ -173,9 +174,11 @@ trait IssuesControllerBase extends ControllerBase {
val issueId = params("id").toInt val issueId = params("id").toInt
params.get("assignedUserName") match { params.get("assignedUserName") match {
case null|None => updateAssignedUserName(owner, repository, issueId, None) case None => updateAssignedUserName(owner, repository, issueId, None)
case Some(userName) => updateAssignedUserName(owner, repository, issueId, Some(userName)) case Some(x) if(x.trim == "") => updateAssignedUserName(owner, repository, issueId, None)
case Some(userName) => updateAssignedUserName(owner, repository, issueId, Some(userName))
} }
Ok("updated")
} }
ajaxPost("/:owner/:repository/issues/milestone/:id"){ ajaxPost("/:owner/:repository/issues/milestone/:id"){
@@ -184,9 +187,11 @@ trait IssuesControllerBase extends ControllerBase {
val issueId = params("id").toInt val issueId = params("id").toInt
params.get("milestoneId") match { params.get("milestoneId") match {
case null|None => updateMilestoneId(owner, repository, issueId, None) case None => updateMilestoneId(owner, repository, issueId, None)
case Some(milestoneId) => updateMilestoneId(owner, repository, issueId, Some(milestoneId.toInt)) case Some(x) if(x.trim == "") => updateMilestoneId(owner, repository, issueId, None)
case Some(milestoneId) => updateMilestoneId(owner, repository, issueId, Some(milestoneId.toInt))
} }
Ok("updated")
} }
private def searchIssues(filter: String) = { private def searchIssues(filter: String) = {