diff --git a/src/main/twirl/gitbucket/core/pulls/menu.scala.html b/src/main/twirl/gitbucket/core/pulls/menu.scala.html index d5bb98b..18f1c27 100644 --- a/src/main/twirl/gitbucket/core/pulls/menu.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/menu.scala.html @@ -83,3 +83,37 @@ } } + diff --git a/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html b/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html deleted file mode 100644 index 93f9fbf..0000000 --- a/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html +++ /dev/null @@ -1,161 +0,0 @@ -@(issue: gitbucket.core.model.Issue, - pullreq: gitbucket.core.model.PullRequest, - comments: List[gitbucket.core.model.Comment], - issueLabels: List[gitbucket.core.model.Label], - collaborators: List[String], - milestones: List[(gitbucket.core.model.Milestone, Int, Int)], - priorities: List[gitbucket.core.model.Priority], - labels: List[gitbucket.core.model.Label], - dayByDayCommits: Seq[Seq[gitbucket.core.util.JGitUtil.CommitInfo]], - diffs: Seq[gitbucket.core.util.JGitUtil.DiffInfo], - isEditable: Boolean, - isManageable: Boolean, - isManageableForkedRepository: Boolean, - repository: gitbucket.core.service.RepositoryService.RepositoryInfo, - forkedRepository: Option[gitbucket.core.service.RepositoryService.RepositoryInfo], - flash: Map[String, String])(implicit context: gitbucket.core.controller.Context) -@import gitbucket.core.view.helpers -@import gitbucket.core.model.IssueComment -@import gitbucket.core.model.CommitComment -@* -@gitbucket.core.html.main(s"${issue.title} - Pull request #${issue.issueId} - ${repository.owner}/${repository.name}", Some(repository)){ - @gitbucket.core.html.menu("pulls", repository){ - @defining(dayByDayCommits.flatten){ commits => -
-
- @if(isManageable || context.loginAccount.map(_.userName == issue.openedUserName).getOrElse(false)){ - Edit - } - @if(context.loginAccount.isDefined){ - New pull request - } -
- -

- - @issue.title - #@issue.issueId - - -

-
-
- @if(issue.closed) { - @comments.flatMap @{ - case comment: IssueComment => Some(comment) - case _ => None - }.find(_.action == "merge").map{ comment => - Merged - - @helpers.user(comment.commentedUserName, styleClass="username strong") merged @commits.size @helpers.plural(commits.size, "commit") - into @pullreq.userName:@pullreq.branch from @pullreq.requestUserName:@pullreq.requestBranch - @gitbucket.core.helper.html.datetimeago(comment.registeredDate) - - }.getOrElse { - Closed - - @helpers.user(issue.openedUserName, styleClass="username strong") wants to merge @commits.size @helpers.plural(commits.size, "commit") - into @pullreq.userName:@pullreq.branch from @pullreq.requestUserName:@pullreq.requestBranch - - } - } else { - Open - - @helpers.user(issue.openedUserName, styleClass="username strong") wants to merge @commits.size @helpers.plural(commits.size, "commit") - into @pullreq.userName:@pullreq.branch from @pullreq.requestUserName:@pullreq.requestBranch - - } -
- -
-
- @flash.get("error").map{ error => -
@error
- } - @flash.get("info").map{ info => -
@info
- } - @gitbucket.core.pulls.html.conversation(issue, pullreq, commits, comments, issueLabels, collaborators, milestones, priorities, labels, isEditable, isManageable, isManageableForkedRepository, repository, forkedRepository) -
-
- @if(commits.nonEmpty){ - @gitbucket.core.pulls.html.commits(dayByDayCommits, repository) - } -
-
- @if(commits.nonEmpty){ - @gitbucket.core.helper.html.diff(diffs, repository, commits.headOption.map(_.id), commits.lastOption.map(_.id), true, Some(pullreq.issueId), isManageable, true) - } -
-
- } - } -} - -*@