Merge release 1.6.0

1 files changed, 3 insertions, 3 deletions

diff --git a/src/main/java/com/gitblit/wicket/pages/EditTeamPage.java b/src/main/java/com/gitblit/wicket/pages/EditTeamPage.java
index a0d11a05..f537f33d 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditTeamPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditTeamPage.java
@@ -86,7 +86,7 @@ public class EditTeamPage extends RootSubPage {
 

 	@Override

 	protected Class<? extends BasePage> getRootNavPageClass() {

-		return UsersPage.class;

+		return TeamsPage.class;

 	}

 

 	protected void setupPage(final TeamModel teamModel) {

@@ -214,7 +214,7 @@ public class EditTeamPage extends RootSubPage {
 							teamModel.name));

 				}

 				// back to users page

-				setResponsePage(UsersPage.class);

+				setResponsePage(TeamsPage.class);

 			}

 		};

 

@@ -249,7 +249,7 @@ public class EditTeamPage extends RootSubPage {
 

 			@Override

 			public void onSubmit() {

-				setResponsePage(UsersPage.class);

+				setResponsePage(TeamsPage.class);

 			}

 		};

 		cancel.setDefaultFormProcessing(false);