opendev/gerrit
Code Issues Proposed changes

Add link to GWT UI footer to switch to PolyGerrit

Browse Source 
Change-Id: I2377df3c109807fd73880c06e325b1f126546321
This commit is contained in:
Dave Borowitz
2016-09-19 22:01:30 +02:00
parent f4599a001d
commit 5db7be5357
4 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/GerritInfo.java
View File

@@ -14,8 +14,13 @@
package com.google.gerrit.client.info;
import com.google.gerrit.extensions.client.UiType;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gwt.core.client.JavaScriptObject;
import com.google.gwt.core.client.JsArrayString;
import java.util.ArrayList;
import java.util.List;
public class GerritInfo extends JavaScriptObject {
public final Project.NameKey allProjectsNameKey() {
@@ -42,6 +47,19 @@ public class GerritInfo extends JavaScriptObject {
public final native String reportBugUrl() /*-{ return this.report_bug_url; }-*/;
public final native String reportBugText() /*-{ return this.report_bug_text; }-*/;
private final native JsArrayString _webUis() /*-{ return this.web_uis; }-*/;
public final List<UiType> webUis() {
JsArrayString webUis = _webUis();
List<UiType> result = new ArrayList<>(webUis.length());
for (int i = 0; i < webUis.length(); i++) {
UiType t = UiType.parse(webUis.get(i));
if (t != null) {
result.add(t);
}
}
return result;
}
protected GerritInfo() {
}
}

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

@@ -50,6 +50,7 @@ import com.google.gerrit.common.data.SystemInfoService;
import com.google.gerrit.extensions.client.DiffPreferencesInfo;
import com.google.gerrit.extensions.client.EditPreferencesInfo;
import com.google.gerrit.extensions.client.GerritTopMenu;
import com.google.gerrit.extensions.client.UiType;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gwt.aria.client.Roles;
import com.google.gwt.core.client.EntryPoint;
@@ -537,6 +538,14 @@ public class Gerrit implements EntryPoint {
btmmenu.add(new InlineHTML(M.poweredBy(vs)));
if (info().gerrit().webUis().contains(UiType.POLYGERRIT)) {
btmmenu.add(new InlineLabel(" | "));
Anchor a = new Anchor(
C.polyGerrit(), GWT.getHostPageBaseURL() + "?polygerrit=1");
a.setStyleName("");
btmmenu.add(a);
}
String reportBugUrl = info().gerrit().reportBugUrl();
if (reportBugUrl != null) {
String reportBugText = info().gerrit().reportBugText();

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

@@ -130,4 +130,6 @@ public interface GerritConstants extends Constants {
String searchDropdownChanges();
String searchDropdownDoc();
String polyGerrit();
}

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.properties
View File

@@ -113,3 +113,5 @@ stringListPanelDown = Down
searchDropdownChanges = Changes
searchDropdownDoc = Docs
polyGerrit = PolyGerrit