opendev/gerrit
Code Issues Proposed changes

Merge "Open first entry in project/group list on ENTER in filter box"

Browse Source
This commit is contained in:
Shawn Pearce
2013-06-14 15:44:24 +00:00
committed by Gerrit Code Review
parent 3fcf72b504 22027dd3a2
commit ccf1b36a52
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/GroupListScreen.java
View File

@@ -23,6 +23,7 @@ import com.google.gerrit.client.ui.AccountScreen;
import com.google.gerrit.client.ui.FilteredUserInterface;
import com.google.gerrit.client.ui.IgnoreOutdatedFilterResultsCallbackWrapper;
import com.google.gerrit.common.PageLinks;
import com.google.gwt.event.dom.client.KeyCodes;
import com.google.gwt.event.dom.client.KeyUpEvent;
import com.google.gwt.event.dom.client.KeyUpHandler;
import com.google.gwt.http.client.URL;
@@ -55,10 +56,10 @@ public class GroupListScreen extends AccountScreen implements FilteredUserInterf
protected void onLoad() {
super.onLoad();
display();
refresh();
refresh(false);
}
private void refresh() {
private void refresh(final boolean open) {
setToken(subname == null || "".equals(subname) ? ADMIN_GROUPS
: ADMIN_GROUPS + "?filter=" + URL.encodeQueryString(subname));
GroupMap.match(subname,
@@ -66,8 +67,13 @@ public class GroupListScreen extends AccountScreen implements FilteredUserInterf
new GerritCallback<GroupMap>() {
@Override
public void onSuccess(GroupMap result) {
groups.display(result, subname);
groups.finishDisplay();
if (open && result.values().length() > 0) {
Gerrit.display(PageLinks.toGroup(
result.values().get(0).getGroupUUID()));
} else {
groups.display(result, subname);
groups.finishDisplay();
}
}
}));
}
@@ -99,7 +105,7 @@ public class GroupListScreen extends AccountScreen implements FilteredUserInterf
@Override
public void onKeyUp(KeyUpEvent event) {
subname = filterTxt.getValue();
refresh();
refresh(event.getNativeEvent().getKeyCode() == KeyCodes.KEY_ENTER);
}
});
hp.add(filterTxt);

14
gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectListScreen.java
View File

@@ -29,6 +29,7 @@ import com.google.gerrit.client.ui.ProjectSearchLink;
import com.google.gerrit.client.ui.ProjectsTable;
import com.google.gerrit.client.ui.Screen;
import com.google.gerrit.common.PageLinks;
import com.google.gwt.event.dom.client.KeyCodes;
import com.google.gwt.event.dom.client.KeyUpEvent;
import com.google.gwt.event.dom.client.KeyUpHandler;
import com.google.gwt.http.client.URL;
@@ -64,10 +65,10 @@ public class ProjectListScreen extends Screen implements FilteredUserInterface {
protected void onLoad() {
super.onLoad();
display();
refresh();
refresh(false);
}
private void refresh() {
private void refresh(final boolean open) {
setToken(subname == null || "".equals(subname) ? ADMIN_PROJECTS
: ADMIN_PROJECTS + "?filter=" + URL.encodeQueryString(subname));
ProjectMap.match(subname,
@@ -75,7 +76,12 @@ public class ProjectListScreen extends Screen implements FilteredUserInterface {
new GerritCallback<ProjectMap>() {
@Override
public void onSuccess(ProjectMap result) {
projects.display(result);
if (open && result.values().length() > 0) {
Gerrit.display(PageLinks.toProject(
result.values().get(0).name_key()));
} else {
projects.display(result);
}
}
}));
}
@@ -153,7 +159,7 @@ public class ProjectListScreen extends Screen implements FilteredUserInterface {
@Override
public void onKeyUp(KeyUpEvent event) {
subname = filterTxt.getValue();
refresh();
refresh(event.getNativeEvent().getKeyCode() == KeyCodes.KEY_ENTER);
}
});
hp.add(filterTxt);