opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14'

Browse Source 
* stable-2.14:
  Fix columns in project tables

Change-Id: If85a070198a96ebe347076b4491ec69932f09307
This commit is contained in:
David Pursehouse
2017-06-12 19:35:33 +09:00
parent 3ea9612c02 ab94a754ed
commit 0099e9ff09
4 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/CreateProjectScreen.java
View File

@@ -220,6 +220,7 @@ public class CreateProjectScreen extends Screen {
@Override @Override
protected void populate(final int row, final ProjectInfo k) { protected void populate(final int row, final ProjectInfo k) {
populateState(row, k);
final Anchor projectLink = new Anchor(k.name()); final Anchor projectLink = new Anchor(k.name());
projectLink.addClickHandler( projectLink.addClickHandler(
new ClickHandler() { new ClickHandler() {
@@ -230,8 +231,8 @@ public class CreateProjectScreen extends Screen {
} }
}); });
table.setWidget(row, 2, projectLink); table.setWidget(row, ProjectsTable.C_NAME, projectLink);
table.setText(row, 3, k.description()); table.setText(row, ProjectsTable.C_DESCRIPTION, k.description());
setRowItem(row, k); setRowItem(row, k);
} }

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

@@ -35,7 +35,6 @@ import com.google.gwt.event.dom.client.KeyUpHandler;
import com.google.gwt.user.client.History; import com.google.gwt.user.client.History;
import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Label;
import com.google.gwtexpui.globalkey.client.NpTextBox; import com.google.gwtexpui.globalkey.client.NpTextBox;
import java.util.List; import java.util.List;
@@ -109,25 +108,8 @@ public class ProjectListScreen extends PaginatedProjectScreen {
} }
@Override @Override
protected void populate(final int row, final ProjectInfo k) { protected void populate(int row, ProjectInfo k) {
Image state = new Image(); populateState(row, k);
switch (k.state()) {
case HIDDEN:
state.setResource(Gerrit.RESOURCES.redNot());
state.setTitle(Util.toLongString(k.state()));
table.setWidget(row, ProjectsTable.C_STATE, state);
break;
case READ_ONLY:
state.setResource(Gerrit.RESOURCES.readOnly());
state.setTitle(Util.toLongString(k.state()));
table.setWidget(row, ProjectsTable.C_STATE, state);
break;
case ACTIVE:
default:
// Intentionally left blank, do not show an icon when active.
break;
}
FlowPanel fp = new FlowPanel(); FlowPanel fp = new FlowPanel();
fp.add(new ProjectSearchLink(k.name_key())); fp.add(new ProjectSearchLink(k.name_key()));
fp.add(new HighlightingInlineHyperlink(k.name(), link(k), match)); fp.add(new HighlightingInlineHyperlink(k.name(), link(k), match));

6
gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HighlightingProjectsTable.java
View File

@@ -28,8 +28,10 @@ public class HighlightingProjectsTable extends ProjectsTable {
@Override @Override
protected void populate(final int row, final ProjectInfo k) { protected void populate(final int row, final ProjectInfo k) {
table.setWidget(row, 1, new InlineHTML(Util.highlight(k.name(), toHighlight))); populateState(row, k);
table.setText(row, 2, k.description()); table.setWidget(
row, ProjectsTable.C_NAME, new InlineHTML(Util.highlight(k.name(), toHighlight)));
table.setText(row, ProjectsTable.C_DESCRIPTION, k.description());
setRowItem(row, k); setRowItem(row, k);
} }

23
gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectsTable.java
View File

@@ -19,6 +19,7 @@ import com.google.gerrit.client.projects.ProjectInfo;
import com.google.gerrit.client.projects.ProjectMap; import com.google.gerrit.client.projects.ProjectMap;
import com.google.gerrit.client.rpc.Natives; import com.google.gerrit.client.rpc.Natives;
import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter; import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
import com.google.gwt.user.client.ui.Image;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
@@ -98,10 +99,30 @@ public class ProjectsTable extends NavigationTable<ProjectInfo> {
} }
protected void populate(final int row, final ProjectInfo k) { protected void populate(final int row, final ProjectInfo k) {
table.setText(row, C_STATE, k.state().toString()); populateState(row, k);
table.setText(row, C_NAME, k.name()); table.setText(row, C_NAME, k.name());
table.setText(row, C_DESCRIPTION, k.description()); table.setText(row, C_DESCRIPTION, k.description());
setRowItem(row, k); setRowItem(row, k);
} }
protected void populateState(int row, ProjectInfo k) {
Image state = new Image();
switch (k.state()) {
case HIDDEN:
state.setResource(Gerrit.RESOURCES.redNot());
state.setTitle(com.google.gerrit.client.admin.Util.toLongString(k.state()));
table.setWidget(row, ProjectsTable.C_STATE, state);
break;
case READ_ONLY:
state.setResource(Gerrit.RESOURCES.readOnly());
state.setTitle(com.google.gerrit.client.admin.Util.toLongString(k.state()));
table.setWidget(row, ProjectsTable.C_STATE, state);
break;
case ACTIVE:
default:
// Intentionally left blank, do not show an icon when active.
break;
}
}
} }