opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.9'

Browse Source 
* stable-2.9:
  Release docs: Describe in more details how to publish to Maven Central
  Document more details about the deploy configuration for Maven Central
  ChangeScreen2: Respect user preference for unified diff view

Change-Id: I423c9ce62d3f33d2ecf6c0c8cd2e669c09693976
This commit is contained in:
David Pursehouse
2014-06-04 10:34:02 +09:00
parent 4b5fc42317 5953773523
commit 6e5bfafce5
3 changed files with 149 additions and 37 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

@@ -673,6 +673,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);
}
@@ -693,8 +699,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())) {