opendev/gerrit
Code Issues Proposed changes

Remove duplicate MyGroupsListScreen

Browse Source 
This was identical in implementation to MyGroupsScreen,
but available at a different URL. Map both to the same
URL so the screen can reuse implementation and properly
fall into the "settings" split, avoiding this code from
being in the initial download.

Change-Id: I28d654930bef00348b6a9b6c7fa41e06ce464b46
This commit is contained in:
Shawn Pearce
2015-01-15 10:52:54 -08:00
parent 0ddfb83db9
commit 4d20e64b59
2 changed files with 9 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java
View File

@@ -56,7 +56,6 @@ import com.google.gerrit.client.admin.AccountGroupScreen;
import com.google.gerrit.client.admin.CreateGroupScreen;
import com.google.gerrit.client.admin.CreateProjectScreen;
import com.google.gerrit.client.admin.GroupListScreen;
import com.google.gerrit.client.admin.MyGroupsListScreen;
import com.google.gerrit.client.admin.PluginListScreen;
import com.google.gerrit.client.admin.ProjectAccessScreen;
import com.google.gerrit.client.admin.ProjectBranchesScreen;
@@ -225,21 +224,19 @@ public class Dispatcher {
} else if (matchPrefix(PROJECTS, token)) {
projects(token);
} else if (matchExact(SETTINGS, token) //
|| matchPrefix("/settings/", token) //
|| matchExact("register", token) //
|| matchExact(REGISTER, token) //
|| matchPrefix("/register/", token) //
|| matchPrefix("/VE/", token) || matchPrefix("VE,", token) //
} else if (matchExact(SETTINGS, token)
|| matchPrefix("/settings/", token)
|| matchExact(MY_GROUPS, token)
|| matchExact("register", token)
|| matchExact(REGISTER, token)
|| matchPrefix("/register/", token)
|| matchPrefix("/VE/", token) || matchPrefix("VE,", token)
|| matchPrefix("/SignInFailure,", token)) {
settings(token);
} else if (matchPrefix("/admin/", token)) {
admin(token);
} else if (matchExact(MY_GROUPS, token)) {
Gerrit.display(token, new MyGroupsListScreen());
} else if (/* DEPRECATED URL */matchPrefix("/c2/", token)) {
change(token);
} else if (/* LEGACY URL */matchPrefix("all,", token)) {
@@ -683,7 +680,8 @@ public class Dispatcher {
return new MyPasswordScreen();
}
if (matchExact(SETTINGS_MYGROUPS, token)) {
if (matchExact(MY_GROUPS, token)
|| matchExact(SETTINGS_MYGROUPS, token)) {
return new MyGroupsScreen();
}