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

Always display repository selector in the new pull request page.

Browse Source
This commit is contained in:
takezoe
2013-08-10 12:34:07 +09:00
parent 03e903eef9
commit 69c5f9e19a
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/app/PullRequestsController.scala
View File

@@ -255,8 +255,8 @@ trait PullRequestsControllerBase extends ControllerBase {
commits, commits,
diffs, diffs,
repository.repository.originUserName.map { userName => repository.repository.originUserName.map { userName =>
getForkedRepositories(userName, repository.name) userName :: getForkedRepositories(userName, repository.name)
} getOrElse Nil, } getOrElse List(repository.owner),
originBranch, originBranch,
forkedBranch, forkedBranch,
oldId.getName, oldId.getName,

16
src/main/twirl/pulls/compare.scala.html
View File

@@ -21,11 +21,9 @@
</div> </div>
<div id="compare-edit" style="display: none;"> <div id="compare-edit" style="display: none;">
<a href="#" id="cancel-condition-editing" class="pull-right"><i class="icon-remove-circle"></i></a> <a href="#" id="cancel-condition-editing" class="pull-right"><i class="icon-remove-circle"></i></a>
@if(members.nonEmpty){ @helper.html.dropdown(originRepository.owner + "/" + repository.name, "base fork") {
@helper.html.dropdown(originRepository.owner + "/" + repository.name, "base fork") { @members.map { member =>
@members.map { member => <li><a href="#" class="origin-owner" data-name="@member">@helper.html.checkicon(member == originRepository.owner) @member/@repository.name</a></li>
<li><a href="#" class="origin-owner" data-name="@member">@helper.html.checkicon(member == originRepository.owner) @member/@repository.name</a></li>
}
} }
} }
@helper.html.dropdown(originId, "base") { @helper.html.dropdown(originId, "base") {
@@ -34,11 +32,9 @@
} }
} }
... ...
@if(members.nonEmpty){ @helper.html.dropdown(forkedRepository.owner + "/" + repository.name, "head fork") {
@helper.html.dropdown(forkedRepository.owner + "/" + repository.name, "head fork") { @members.map { member =>
@members.map { member => <li><a href="#" class="forked-owner" data-name="@member">@helper.html.checkicon(member == forkedRepository.owner) @member/@repository.name</a></li>
<li><a href="#" class="forked-owner" data-name="@member">@helper.html.checkicon(member == forkedRepository.owner) @member/@repository.name</a></li>
}
} }
} }
@helper.html.dropdown(forkedId, "compare") { @helper.html.dropdown(forkedId, "compare") {