favorite: Use convention go to menu

yona-projects · Aug 10, 2017 · b42987a · b42987a
1 parent dc30300
commit b42987a
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 3 deletions.
diff --git a/app/controllers/IssueApp.java b/app/controllers/IssueApp.java
@@ -102,6 +102,12 @@ private static boolean hasNotConditions(models.support.SearchCondition searchCon
                 && searchCondition.commenterId == null;
     }
 
+    @Transactional
+    @IsAllowed(Operation.READ)
+    public static Result issues(String ownerName, String projectName) throws WriteException, IOException {
+       return issues(ownerName, projectName, State.OPEN.state(), "html", 1);
+    }
+
     @Transactional
     @IsAllowed(Operation.READ)
     public static Result issues(String ownerName, String projectName, String state, String format, int pageNum) throws WriteException, IOException {

diff --git a/app/controllers/ProjectApp.java b/app/controllers/ProjectApp.java
@@ -13,6 +13,7 @@
 import controllers.annotation.GuestProhibit;
 import controllers.annotation.IsAllowed;
 import info.schleichardt.play2.mailplugin.Mailer;
+import jxl.write.WriteException;
 import models.*;
 import models.enumeration.*;
 import org.apache.commons.collections.CollectionUtils;
@@ -1229,4 +1230,22 @@ public static Result deletePushedBranch(String ownerId, String projectName, Long
         }
         return ok();
     }
+
+    @IsAllowed(Operation.READ)
+    @Transactional
+    public static Result goConventionMenu(String ownerId, String projectName)
+            throws IOException, ServletException, SVNException, GitAPIException, WriteException {
+        Project project = Project.findByOwnerAndProjectName(ownerId, projectName);
+        List<History> histories = null;
+
+        if( project.menuSetting.issue ) {
+            return IssueApp.issues(project.owner, project.name);
+        }
+
+        if( project.menuSetting.board ) {
+            return redirect(routes.BoardApp.posts(project.owner, project.name, 1));
+        }
+
+        return redirect(routes.ProjectApp.project(project.owner, project.name));
+    }
 }
diff --git a/app/views/index/myProjectList_partial.scala.html b/app/views/index/myProjectList_partial.scala.html
@@ -7,14 +7,14 @@
 @(project:Project, favored:Boolean, isLast:Boolean = false)
 @import utils.TemplateHelper._
 
-<li class="user-li @if(isLast){favored}" onclick="window.location='@routes.ProjectApp.project(project.owner, project.name)';">
+<li class="user-li @if(isLast){favored}" onclick="window.location='@routes.ProjectApp.goConventionMenu(project.owner, project.name)';">
     <div class="project-list project-flex-container">
         <div class="project-item project-item-container">
             <div class="flex-item site-logo">
-                <i class="project-avatar">@if(hasProjectLogo(project)){<a href="@routes.ProjectApp.project(project.owner, project.name)" ><img class="logo" src="@urlToProjectLogo(project)"></a>}else{<span class="dummy-25px"> </span>}</i>
+                <i class="project-avatar">@if(hasProjectLogo(project)){<a href="@routes.ProjectApp.goConventionMenu(project.owner, project.name)" ><img class="logo" src="@urlToProjectLogo(project)"></a>}else{<span class="dummy-25px"> </span>}</i>
             </div>
             <div class="projectName-owner flex-item">
-                <div class="project-name flex-item"><a href="@routes.ProjectApp.project(project.owner, project.name)">@project.name @if(project.isPrivate){<i class="yobicon-lock yobicon-small"></i>}</a></div>
+                <div class="project-name flex-item"><a href="@routes.ProjectApp.goConventionMenu(project.owner, project.name)">@project.name @if(project.isPrivate){<i class="yobicon-lock yobicon-small"></i>}</a></div>
                 <div class="project-owner flex-item"><a href="@routes.UserApp.userInfo(project.owner)" >@project.owner</a></div>
             </div>
         </div>

diff --git a/conf/routes b/conf/routes
@@ -204,6 +204,9 @@ GET            /:user/:project/search
 GET            /:user/:project/changeVCS                                              controllers.ProjectApp.changeVCSForm(user, project)
 POST           /:user/:project/changeVCS                                              controllers.ProjectApp.changeVCS(user, project)
 
+# Project menu forwarding
+GET            /:user/:project/go                                                     controllers.ProjectApp.goConventionMenu(user, project)
+
 # Project Review Menu
 GET            /:user/:project/reviews                                                controllers.ReviewThreadApp.reviewThreads(user, project)