opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15'

Browse Source 
* stable-2.15:
  Change "WorkInProgress" to "Work in Progress"
  ChangeTable: Show "Work in Progress" in status column
  ChangeScreen: Don't show "Merge Conflict" for submittable WIP change

Change-Id: I17aebee341f16b25167620a526f6daa3653a23d4
This commit is contained in:
David Pursehouse
2018-04-25 13:34:47 +09:00
parent 3459511d2e 217fab6ab1
commit f609340ec1
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java
View File

@@ -1259,7 +1259,7 @@ public class ChangeScreen extends Screen {
} }
private void renderSubmitType(Change.Status status, boolean canSubmit, SubmitType submitType) { private void renderSubmitType(Change.Status status, boolean canSubmit, SubmitType submitType) {
if (canSubmit && status == Change.Status.NEW) { if (canSubmit && status == Change.Status.NEW && !changeInfo.isWorkInProgress()) {
statusText.setInnerText( statusText.setInnerText(
changeInfo.mergeable() ? Util.C.readyToSubmit() : Util.C.mergeConflict()); changeInfo.mergeable() ? Util.C.readyToSubmit() : Util.C.mergeConflict());
} }

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

@@ -8,7 +8,7 @@ mergeConflict = Merge Conflict
notCurrent = Not Current notCurrent = Not Current
changeEdit = Change Edit changeEdit = Change Edit
isPrivate = (Private) isPrivate = (Private)
isWorkInProgress = (WorkInProgress) isWorkInProgress = (Work in Progress)
myDashboardTitle = My Reviews myDashboardTitle = My Reviews
unknownDashboardTitle = Code Review Dashboard unknownDashboardTitle = Code Review Dashboard

5
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable.java
View File

@@ -240,6 +240,11 @@ public class ChangeTable extends NavigationTable<ChangeInfo> {
row, row,
C_STATUS, C_STATUS,
Util.toLongString(status) + (c.isPrivate() ? (" " + Util.C.isPrivate()) : "")); Util.toLongString(status) + (c.isPrivate() ? (" " + Util.C.isPrivate()) : ""));
} else if (c.isWorkInProgress()) {
table.setText(
row,
C_STATUS,
Util.C.workInProgress() + (c.isPrivate() ? (" " + Util.C.isPrivate()) : ""));
} else if (!c.mergeable()) { } else if (!c.mergeable()) {
table.setText( table.setText(
row, row,