codeBrowser: Fix Code browser nav tab link error

yona-projects · Dec 16, 2016 · cb81968 · cb81968
1 parent 8afa58b
commit cb81968
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/app/views/code/branches.scala.html b/app/views/code/branches.scala.html
@@ -19,8 +19,16 @@
 * limitations under the License.
 **@
 @(project: Project, branches: List[playRepository.GitBranch], head: playRepository.GitBranch)
+@defaultBranch = @{
+    if(project.defaultBranch().lastIndexOf("/") > 0){
+        project.defaultBranch().substring(project.defaultBranch().lastIndexOf("/") + 1)
+    } else {
+        project.defaultBranch()
+    }
+}
 
 @import utils.AccessControl._
+@import java.net.URLEncoder
 
 @projectLayout(Messages("title.branches"), project, utils.MenuType.CODE) {
 @projectMenu(project, utils.MenuType.CODE, "main-menu-only")
@@ -30,10 +38,10 @@
             <div class="code-browse-wrap">
                 <ul class="nav nav-tabs" style="margin-bottom:20px;">
                     <li>
-                        <a href="@routes.CodeApp.codeBrowserWithBranch(project.owner, project.name, "HEAD", "")">@Messages("code.files")</a>
+                        <a href="@routes.CodeApp.codeBrowserWithBranch(project.owner, project.name, defaultBranch, "")">@Messages("code.files")</a>
                     </li>
                     <li>
-                        <a href="@routes.CodeHistoryApp.historyUntilHead(project.owner, project.name)">@Messages("code.commits")</a>
+                        <a href="@routes.CodeHistoryApp.history(project.owner, project.name, defaultBranch, "")">@Messages("code.commits")</a>
                     </li>
                     @if(project.isGit) {
                     <li class="active">