opendev/gerrit
Code Issues Proposed changes

Merge "Show change status in separate column for dashboards, and searches"

Browse Source
This commit is contained in:
Shawn Pearce
2013-05-10 17:46:41 +00:00
committed by Gerrit Code Review
parent 2165ff661e e3c5182f56
commit 4c7b444b6d
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeConstants.java
View File

@@ -37,6 +37,7 @@ public interface ChangeConstants extends Constants {
String allMergedChanges(); String allMergedChanges();
String changeTableColumnSubject(); String changeTableColumnSubject();
String changeTableColumnStatus();
String changeTableColumnOwner(); String changeTableColumnOwner();
String changeTableColumnReviewers(); String changeTableColumnReviewers();
String changeTableColumnProject(); String changeTableColumnProject();

1
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeConstants.properties
View File

@@ -17,6 +17,7 @@ allAbandonedChanges = All abandoned changes
allMergedChanges = All merged changes allMergedChanges = All merged changes
changeTableColumnSubject = Subject changeTableColumnSubject = Subject
changeTableColumnStatus = Status
changeTableColumnOwner = Owner changeTableColumnOwner = Owner
changeTableColumnReviewers = Reviewers changeTableColumnReviewers = Reviewers
changeTableColumnProject = Project changeTableColumnProject = Project

19
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable2.java
View File

@@ -48,11 +48,12 @@ import java.util.List;
public class ChangeTable2 extends NavigationTable<ChangeInfo> { public class ChangeTable2 extends NavigationTable<ChangeInfo> {
private static final int C_STAR = 1; private static final int C_STAR = 1;
private static final int C_SUBJECT = 2; private static final int C_SUBJECT = 2;
private static final int C_OWNER = 3; private static final int C_STATUS = 3;
private static final int C_PROJECT = 4; private static final int C_OWNER = 4;
private static final int C_BRANCH = 5; private static final int C_PROJECT = 5;
private static final int C_LAST_UPDATE = 6; private static final int C_BRANCH = 6;
private static final int BASE_COLUMNS = 7; private static final int C_LAST_UPDATE = 7;
private static final int BASE_COLUMNS = 8;
private final List<Section> sections; private final List<Section> sections;
private int columns; private int columns;
@@ -70,6 +71,7 @@ public class ChangeTable2 extends NavigationTable<ChangeInfo> {
sections = new ArrayList<Section>(); sections = new ArrayList<Section>();
table.setText(0, C_STAR, ""); table.setText(0, C_STAR, "");
table.setText(0, C_SUBJECT, Util.C.changeTableColumnSubject()); table.setText(0, C_SUBJECT, Util.C.changeTableColumnSubject());
table.setText(0, C_STATUS, Util.C.changeTableColumnStatus());
table.setText(0, C_OWNER, Util.C.changeTableColumnOwner()); table.setText(0, C_OWNER, Util.C.changeTableColumnOwner());
table.setText(0, C_PROJECT, Util.C.changeTableColumnProject()); table.setText(0, C_PROJECT, Util.C.changeTableColumnProject());
table.setText(0, C_BRANCH, Util.C.changeTableColumnBranch()); table.setText(0, C_BRANCH, Util.C.changeTableColumnBranch());
@@ -90,6 +92,8 @@ public class ChangeTable2 extends NavigationTable<ChangeInfo> {
} }
if (cell.getCellIndex() == C_STAR) { if (cell.getCellIndex() == C_STAR) {
// Don't do anything (handled by star itself). // Don't do anything (handled by star itself).
} else if (cell.getCellIndex() == C_STATUS) {
// Don't do anything.
} else if (cell.getCellIndex() == C_OWNER) { } else if (cell.getCellIndex() == C_OWNER) {
// Don't do anything. // Don't do anything.
} else if (getRowItem(cell.getRowIndex()) != null) { } else if (getRowItem(cell.getRowIndex()) != null) {
@@ -191,11 +195,12 @@ public class ChangeTable2 extends NavigationTable<ChangeInfo> {
} }
String subject = Util.cropSubject(c.subject()); String subject = Util.cropSubject(c.subject());
table.setWidget(row, C_SUBJECT, new TableChangeLink(subject, c));
Change.Status status = c.status(); Change.Status status = c.status();
if (status != Change.Status.NEW) { if (status != Change.Status.NEW) {
subject += " (" + Util.toLongString(status) + ")"; table.setText(row, C_STATUS, Util.toLongString(status));
} }
table.setWidget(row, C_SUBJECT, new TableChangeLink(subject, c));
if (c.owner() != null) { if (c.owner() != null) {
table.setWidget(row, C_OWNER, new AccountLinkPanel(c.owner(), status)); table.setWidget(row, C_OWNER, new AccountLinkPanel(c.owner(), status));