opendev/gerrit
Code Issues Proposed changes

Merge "ChangeScreen2: Respect user preference for unified diff view" into stable-2.9

Browse Source
This commit is contained in:
David Pursehouse
2014-06-04 01:33:15 +00:00
committed by Gerrit Code Review
parent 210b636dc0 33d8738a92
commit 5953773523
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gerrit-gwtui/src/main/java/com/google/gerrit/client/Dispatcher.java
View File

@@ -652,6 +652,12 @@ public class Dispatcher {
if ("".equals(panel)) {
if (isChangeScreen2()) {
if (Gerrit.isSignedIn()
&& DiffView.UNIFIED_DIFF.equals(Gerrit.getUserAccount()
.getGeneralPreferences().getDiffView())) {
return new PatchScreen.Unified(id, patchIndex, patchSetDetail,
patchTable, top, baseId);
}
return new SideBySide2(baseId, id.getParentKey(), id.get(),
side, line);
}
@@ -672,8 +678,7 @@ public class Dispatcher {
top, //
baseId //
);
} else if (("cm".equals(panel) && Gerrit.getConfig().getNewFeatures())
|| ("".equals(panel) && isChangeScreen2())) {
} else if ("cm".equals(panel) && Gerrit.getConfig().getNewFeatures()) {
if (Gerrit.isSignedIn()
&& DiffView.UNIFIED_DIFF.equals(Gerrit.getUserAccount()
.getGeneralPreferences().getDiffView())) {