opendev/gerrit
Code Issues Proposed changes

Properly handle double click on external group in GroupTable

Browse Source 
Previously double click action on row with external group result in
"Undefined group exception" because Gerrit trys to load internal group
screen for this group. Now we will discover external groups and use
external group URL (if provided) to forward user to external system same
as we do on single click.

Change-Id: I3636d6af306d5eebf48dc76ca66662271d378f10
Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
This commit is contained in:
Dariusz Luksza 2013-07-02 11:43:49 +02:00
parent 6eb69e631b
commit 1860572b47
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupTable.java
View File

@ -29,6 +29,7 @@ import com.google.gerrit.common.PageLinks;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.user.client.History;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Anchor;
import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
import com.google.gwt.user.client.ui.HTMLTable.Cell;
@ -77,7 +78,12 @@ public class GroupTable extends NavigationTable<GroupInfo> {
@Override
protected void onOpenRow(final int row) {
History.newItem(Dispatcher.toGroup(getRowItem(row).getGroupId()));
GroupInfo groupInfo = getRowItem(row);
if (isInteralGroup(groupInfo)) {
History.newItem(Dispatcher.toGroup(groupInfo.getGroupId()));
} else if (groupInfo.url() != null) {
Window.open(groupInfo.url(), "_self", null);
}
}
public void display(GroupMap groups, String toHighlight) {
@ -108,7 +114,7 @@ public class GroupTable extends NavigationTable<GroupInfo> {
void populate(final int row, final GroupInfo k, final String toHighlight) {
if (k.url() != null) {
if (k.url().startsWith("#" + PageLinks.ADMIN_GROUPS)) {
if (isInteralGroup(k)) {
table.setWidget(row, 1, new HighlightingInlineHyperlink(k.name(),
Dispatcher.toGroup(k.getGroupId()), toHighlight));
} else {
@ -133,4 +139,9 @@ public class GroupTable extends NavigationTable<GroupInfo> {
setRowItem(row, k);
}
private boolean isInteralGroup(final GroupInfo groupInfo) {
return groupInfo != null
&& groupInfo.url().startsWith("#" + PageLinks.ADMIN_GROUPS);
}
}