Commit @a35a14ea8f6f1a157ccd9820de10ec8549fdff4b

[Notice] Announcing the End of Demo Server [Read me]

doortts 2017-09-06

favorite: Fix page navigation bug when using favorite menu

@a35a14ea8f6f1a157ccd9820de10ec8549fdff4b

ea70650

a35a14e

app/controllers/ProjectApp.java

--- app/controllers/ProjectApp.java

+++ app/controllers/ProjectApp.java


 
     @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));

ea70650

a35a14e

conf/routes

--- conf/routes

+++ conf/routes


 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)

Add a comment

Open 0
Closed 0

List

...	...	@@ -1285,17 +1285,17 @@
1285	1285
1286	1286	@IsAllowed(Operation.READ)
1287	1287	@Transactional
1288		- public static Result goConventionMenu(String ownerId, String projectName)
	1288	+ public static Result goConventionMenu(String ownerId, String projectName, String state, String format, int pageNum)
1289	1289	throws IOException, ServletException, SVNException, GitAPIException, WriteException {
1290	1290	Project project = Project.findByOwnerAndProjectName(ownerId, projectName);
1291	1291	List<History> histories = null;
1292	1292
1293	1293	if( project.menuSetting.issue ) {
1294		- return IssueApp.issues(project.owner, project.name);
	1294	+ return IssueApp.issues(project.owner, project.name, state, format, pageNum);
1295	1295	}
1296	1296
1297	1297	if( project.menuSetting.board ) {
1298		- return redirect(routes.BoardApp.posts(project.owner, project.name, 1));
	1298	+ return redirect(routes.BoardApp.posts(project.owner, project.name, pageNum));
1299	1299	}
1300	1300
1301	1301	return redirect(routes.ProjectApp.project(project.owner, project.name));

...	...	@@ -213,7 +213,7 @@
213	213	POST /:user/:project/changeVCS controllers.ProjectApp.changeVCS(user, project)
214	214
215	215	# Project menu forwarding
216		-GET /:user/:project/go controllers.ProjectApp.goConventionMenu(user, project)
	216	+GET /:user/:project/go controllers.ProjectApp.goConventionMenu(user, project, state:String ?= "", format:String ?= "html", pageNum: Int ?= 1)
217	217
218	218	# Project Review Menu
219	219	GET /:user/:project/reviews controllers.ReviewThreadApp.reviewThreads(user, project)

Delete comment