opendev/gerrit
Code Issues Proposed changes

Read mergeable bit from cache

Browse Source 
Change callers on the client side to get this from ChangeInfo
(populated by ChangeJson) rather than Change.

Continue writing to the database, to facilitate online migration.

Change-Id: I7273e0253d357ff80aa3baf2b833419749b958ef
This commit is contained in:
Dave Borowitz
2014-10-09 15:37:58 -07:00
parent db27fb3064
commit 10129d4af2
5 changed files with 53 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,6 +91,7 @@ public class ChangeDetailCache extends ListenableValue<ChangeDetail> {
r.setChange(toChange(info));
r.setStarred(info.starred());
r.setPatchSets(toPatchSets(info));
r.setMergeable(info.mergeable());
r.setMessages(toMessages(info));
r.setAccounts(users(info));
r.setCurrentPatchSetId(new PatchSet.Id(info.legacy_id(), rev._number()));
@@ -224,7 +225,6 @@ public class ChangeDetailCache extends ListenableValue<ChangeDetail> {
c.setStatus(info.status());
c.setCurrentPatchSet(p);
c.setLastUpdatedOn(info.updated());
c.setMergeable(info.mergeable());
return c;
}

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

@@ -125,7 +125,7 @@ public class ChangeInfoBlock extends Composite {
if (Gerrit.getConfig().getNewFeatures()
&& (status.equals(Change.Status.NEW) || status.equals(Change.Status.DRAFT))) {
table.getRowFormatter().setVisible(R_MERGE_TEST, true);
table.setText(R_MERGE_TEST, 1, chg.isMergeable() ? Util.C
table.setText(R_MERGE_TEST, 1, changeDetail.isMergeable() ? Util.C
.changeInfoBlockCanMergeYes() : Util.C.changeInfoBlockCanMergeNo());
} else {
table.getRowFormatter().setVisible(R_MERGE_TEST, false);