opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.7'

Browse Source 
* stable-2.7:
  Fix: Duplicate options of permitted_labels.
  Make links appear with the same color in Change UI
  Update revision of reviewnotes plugin

Conflicts:
	gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java

Change-Id: I5639ed4fbfdf45a31fccc24d5ec7e4a05723ffc4
This commit is contained in:
Dave Borowitz
2013-09-30 11:18:25 -07:00
parent b749af0dc6 b4497fd7ce
commit 8a83d51d6c
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -421,12 +421,19 @@ public class PatchTable extends Composite {
table.setWidget(row, C_PATH, nameCol);
int C_UNIFIED = C_SIDEBYSIDE + 1;
table.setWidget(row, C_SIDEBYSIDE, new PatchLink.SideBySide(
Util.C.patchTableDiffSideBySide(), base, patch.getKey(), row - 1,
detail, PatchTable.this));
table.setWidget(row, C_UNIFIED, new PatchLink.Unified(
Util.C.patchTableDiffUnified(), base, patch.getKey(), row - 1,
detail, PatchTable.this));
PatchLink sideBySide =
new PatchLink.SideBySide(Util.C.patchTableDiffSideBySide(), base,
patch.getKey(), row - 1, detail, PatchTable.this);
sideBySide.setStyleName("gwt-Anchor");
PatchLink unified =
new PatchLink.Unified(Util.C.patchTableDiffUnified(), base,
patch.getKey(), row - 1, detail, PatchTable.this);
unified.setStyleName("gwt-Anchor");
table.setWidget(row, C_SIDEBYSIDE, sideBySide);
table.setWidget(row, C_UNIFIED, unified);
}
void initializeLastRow(int row) {