favorite: Fix page navigation bug when using favorite menu

yona-projects · Sep 24, 2017 · a35a14e · a35a14e
1 parent ea70650
commit a35a14e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/controllers/ProjectApp.java b/app/controllers/ProjectApp.java
@@ -1285,17 +1285,17 @@ public static Result deletePushedBranch(String ownerId, String projectName, Long
 
     @IsAllowed(Operation.READ)
     @Transactional
-    public static Result goConventionMenu(String ownerId, String projectName)
+    public static Result goConventionMenu(String ownerId, String projectName, String state, String format, int pageNum)
             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);
+            return IssueApp.issues(project.owner, project.name, state, format, pageNum);
         }
 
         if( project.menuSetting.board ) {
-            return redirect(routes.BoardApp.posts(project.owner, project.name, 1));
+            return redirect(routes.BoardApp.posts(project.owner, project.name, pageNum));
         }
 
         return redirect(routes.ProjectApp.project(project.owner, project.name));

diff --git a/conf/routes b/conf/routes
@@ -213,7 +213,7 @@ GET            /:user/:project/changeVCS
 POST           /:user/:project/changeVCS                                              controllers.ProjectApp.changeVCS(user, project)
 
 # Project menu forwarding
-GET            /:user/:project/go                                                     controllers.ProjectApp.goConventionMenu(user, project)
+GET            /:user/:project/go                                                     controllers.ProjectApp.goConventionMenu(user, project, state:String ?= "", format:String ?= "html", pageNum: Int ?= 1)
 
 # Project Review Menu
 GET            /:user/:project/reviews                                                controllers.ReviewThreadApp.reviewThreads(user, project)