diff --git a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala index 6aec618..c036c08 100644 --- a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala +++ b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala @@ -340,7 +340,6 @@ originRepository, forkedRepository, hasWritePermission(originRepository.owner, originRepository.name, context.loginAccount), - hasWritePermission(forkedRepository.owner, forkedRepository.name, context.loginAccount), (getCollaborators(originRepository.owner, originRepository.name) ::: (if(getAccountByUserName(originRepository.owner).get.isGroupAccount) Nil else List(originRepository.owner))).sorted, getMilestones(originRepository.owner, originRepository.name), getLabels(originRepository.owner, originRepository.name) diff --git a/src/main/twirl/gitbucket/core/pulls/compare.scala.html b/src/main/twirl/gitbucket/core/pulls/compare.scala.html index bdaac65..d68a129 100644 --- a/src/main/twirl/gitbucket/core/pulls/compare.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/compare.scala.html @@ -10,7 +10,6 @@ originRepository: gitbucket.core.service.RepositoryService.RepositoryInfo, forkedRepository: gitbucket.core.service.RepositoryService.RepositoryInfo, hasOriginWritePermission: Boolean, - hasForkedWritePermission: Boolean, collaborators: List[String], milestones: List[gitbucket.core.model.Milestone], labels: List[gitbucket.core.model.Label])(implicit context: gitbucket.core.controller.Context) @@ -19,12 +18,7 @@ @html.main(s"Pull Requests - ${repository.owner}/${repository.name}", Some(repository)){ @html.menu("pulls", repository){
-
- Edit - @originRepository.owner:@originId ... @forkedRepository.owner:@forkedId -
- - @if(commits.nonEmpty && hasForkedWritePermission){ -
+ @if(commits.nonEmpty && loginAccount.isDefined){ +
Create pull request +    + Discuss and review the changes in this comparison with others.
- @gitbucket.core.issues.html.issueinfo(None, Nil, Nil, collaborators, milestones.map((_, 0, 0)), labels, hasOriginWritePermission, repository) + @issues.html.issueinfo(None, Nil, Nil, collaborators, milestones.map((_, 0, 0)), labels, hasOriginWritePermission, repository)
@@ -161,31 +157,18 @@ } - @* - @pulls.html.commits(commits, Some(comments), repository) - *@ - @helper.html.diff(diffs, repository, Some(commitId), Some(sourceId), true, None, hasForkedWritePermission, false) + @helper.html.diff(diffs, repository, Some(commitId), Some(sourceId), true, None, false, false)

Showing you all comments on commits in this comparison.

- @issues.html.commentlist(None, comments, hasForkedWritePermission, repository, None) + @issues.html.commentlist(None, comments, false, repository, None) } } }