opendev/gerrit
Code Issues Proposed changes

ChangeScreen2: Respect user preference for unified diff view

Browse Source 
Change-Id: I6ca7c3957bc111bb1a6bc8a73c607fbe75db6ea5
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
This commit is contained in:
Edwin Kempin 2014-06-03 15:05:54 +02:00
parent e5b4943e48
commit 33d8738a92
1 changed files with 7 additions and 2 deletions
Show Stats 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 ("".equals(panel)) {
if (isChangeScreen2()) { 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(), return new SideBySide2(baseId, id.getParentKey(), id.get(),
side, line); side, line);
} }
@ -672,8 +678,7 @@ public class Dispatcher {
top, // top, //
baseId // baseId //
); );
} else if (("cm".equals(panel) && Gerrit.getConfig().getNewFeatures()) } else if ("cm".equals(panel) && Gerrit.getConfig().getNewFeatures()) {
|| ("".equals(panel) && isChangeScreen2())) {
if (Gerrit.isSignedIn() if (Gerrit.isSignedIn()
&& DiffView.UNIFIED_DIFF.equals(Gerrit.getUserAccount() && DiffView.UNIFIED_DIFF.equals(Gerrit.getUserAccount()
.getGeneralPreferences().getDiffView())) { .getGeneralPreferences().getDiffView())) {