yona-projects / yona star
doortts doortts 2017-03-26
code: Fix file tab link bug 
For files of root path, 'file' tab menu link isn't properly set.
This commit fix that problem.

See: Yona Github issue #189
@1b873ae29356ecd95fe660f8a7403e0f9eb2d08c
3379a7f
1b873ae
app/views/code/view.scala.html
--- app/views/code/view.scala.html
+++ app/views/code/view.scala.html
@@ -46,6 +46,14 @@
 
     }
 
 }
 
 
+@pathWithoutFileName(path:String) = @{
 
+    if(path.lastIndexOf("/") > 0){
 
+        path.substring(0, path.lastIndexOf("/"))
 
+    } else {
 
+        ""
 
+    }
 
+}
 
+
 
 @projectLayout(Messages("menu.code"), project, utils.MenuType.CODE){
 
 @projectMenu(project, utils.MenuType.CODE, "main-menu-only")
 
 <div class="page-wrap-outer">
@@ -53,11 +61,7 @@
 
         <div class="code-browse-wrap">
 
             @if(fieldText(recursiveData{0}, "type").eq("folder")){
 
             <ul class="nav nav-tabs">
 
-                @if(path.lastIndexOf("/") > 0){
 
-                <li class="active"><a href="@routes.CodeApp.codeBrowserWithBranch(project.owner, project.name, URLEncoder.encode(branch, "UTF-8"), path.substring(0, path.lastIndexOf("/")))">@Messages("code.files")</a></li>
 
-                } else {
 
-                <li class="active"><a href="@routes.CodeApp.codeBrowserWithBranch(project.owner, project.name, URLEncoder.encode(branch, "UTF-8"), path)">@Messages("code.files")</a></li>
 
-                }
 
+                <li class="active"><a href="@routes.CodeApp.codeBrowserWithBranch(project.owner, project.name, URLEncoder.encode(branch, "UTF-8"), pathWithoutFileName(path))">@Messages("code.files")</a></li>
 
                 @if(branch.eq("HEAD")){
 
                 <li><a href="@routes.CodeHistoryApp.historyUntilHead(project.owner, project.name)">@Messages("code.commits")</a></li>
 
                 } else {
Add a comment
List