opendev/gerrit
Code Issues Proposed changes

Revert "Expose RevisionInfo to panel extension points"

Browse Source 
This reverts commit afe59c7a66.
This change broke the "diff against" drop down, see issue[1].

[1]https://code.google.com/p/gerrit/issues/detail?id=3998

Change-Id: I24aa1e09f9e35bc8a3322ca4bf182367128f65a1
This commit is contained in:
Hugo Arès
2016-03-18 10:32:31 +01:00
parent 7dea9946dc
commit 7c546d4133
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-gwtui-common/src/main/java/com/google/gerrit/client/GerritUiExtensionPoint.java
View File

@@ -34,6 +34,6 @@ public enum GerritUiExtensionPoint {
PROJECT_INFO_SCREEN_TOP, PROJECT_INFO_SCREEN_BOTTOM; PROJECT_INFO_SCREEN_TOP, PROJECT_INFO_SCREEN_BOTTOM;
public enum Key { public enum Key {
ACCOUNT_INFO, CHANGE_INFO, PROJECT_NAME, REVISION_INFO ACCOUNT_INFO, CHANGE_INFO, PROJECT_NAME
} }
} }

15
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java
View File

@@ -278,28 +278,28 @@ public class ChangeScreen extends Screen {
@Override @Override
public void onSuccess(ChangeInfo info) { public void onSuccess(ChangeInfo info) {
info.init(); info.init();
addExtensionPoints(info);
loadConfigInfo(info, base); loadConfigInfo(info, base);
} }
})); }));
} }
private void addExtensionPoints(ChangeInfo change, RevisionInfo rev) { private void addExtensionPoints(ChangeInfo change) {
addExtensionPoint(GerritUiExtensionPoint.CHANGE_SCREEN_HEADER, addExtensionPoint(GerritUiExtensionPoint.CHANGE_SCREEN_HEADER,
headerExtension, change, rev); headerExtension, change);
addExtensionPoint(GerritUiExtensionPoint.CHANGE_SCREEN_HEADER_RIGHT_OF_BUTTONS, addExtensionPoint(GerritUiExtensionPoint.CHANGE_SCREEN_HEADER_RIGHT_OF_BUTTONS,
headerExtensionMiddle, change, rev); headerExtensionMiddle, change);
addExtensionPoint(GerritUiExtensionPoint.CHANGE_SCREEN_HEADER_RIGHT_OF_POP_DOWNS, addExtensionPoint(GerritUiExtensionPoint.CHANGE_SCREEN_HEADER_RIGHT_OF_POP_DOWNS,
headerExtensionRight, change, rev); headerExtensionRight, change);
addExtensionPoint( addExtensionPoint(
GerritUiExtensionPoint.CHANGE_SCREEN_BELOW_CHANGE_INFO_BLOCK, GerritUiExtensionPoint.CHANGE_SCREEN_BELOW_CHANGE_INFO_BLOCK,
changeExtension, change, rev); changeExtension, change);
} }
private void addExtensionPoint(GerritUiExtensionPoint extensionPoint, private void addExtensionPoint(GerritUiExtensionPoint extensionPoint,
Panel p, ChangeInfo change, RevisionInfo rev) { Panel p, ChangeInfo change) {
ExtensionPanel extensionPanel = new ExtensionPanel(extensionPoint); ExtensionPanel extensionPanel = new ExtensionPanel(extensionPoint);
extensionPanel.putObject(GerritUiExtensionPoint.Key.CHANGE_INFO, change); extensionPanel.putObject(GerritUiExtensionPoint.Key.CHANGE_INFO, change);
extensionPanel.putObject(GerritUiExtensionPoint.Key.REVISION_INFO, rev);
p.add(extensionPanel); p.add(extensionPanel);
} }
@@ -895,7 +895,6 @@ public class ChangeScreen extends Screen {
} }
} }
final RevisionInfo rev = resolveRevisionToDisplay(info); final RevisionInfo rev = resolveRevisionToDisplay(info);
addExtensionPoints(info, rev);
final RevisionInfo b = resolveRevisionOrPatchSetId(info, base, null); final RevisionInfo b = resolveRevisionOrPatchSetId(info, base, null);
CallbackGroup group = new CallbackGroup(); CallbackGroup group = new CallbackGroup();