Make ServerInfo accessible by plugins
The ServerInfo information provides information about the server configuration that is relevant for rendering the UI. UI plugins should be able to access it, e.g. they need the anonymous coward name to render user names the same way as Gerrit core does (use the anonymous coward name if the user has no full name). Change-Id: I272bcb96b5ce888007f6c4fa12f74ef750cc9862 Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
This commit is contained in:
@@ -60,6 +60,11 @@ self.get(url, callback)
|
||||
a string, otherwise the result is a JavaScript object or array,
|
||||
as described in the relevant REST API documentation.
|
||||
|
||||
[[self_getServerInfo]]
|
||||
=== self.getServerInfo()
|
||||
Returns the server's link:rest-api-config.html#server-info[ServerInfo]
|
||||
data.
|
||||
|
||||
[[self_getCurrentUser]]
|
||||
=== self.getCurrentUser()
|
||||
Returns the currently signed in user's AccountInfo data; empty account
|
||||
|
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package com.google.gerrit.client.config;
|
||||
package com.google.gerrit.client.info;
|
||||
|
||||
import com.google.gerrit.client.rpc.Natives;
|
||||
import com.google.gerrit.reviewdb.client.Account;
|
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package com.google.gerrit.client.config;
|
||||
package com.google.gerrit.client.info;
|
||||
|
||||
import com.google.gerrit.client.rpc.NativeMap;
|
||||
import com.google.gerrit.client.rpc.NativeString;
|
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package com.google.gerrit.client.config;
|
||||
package com.google.gerrit.client.info;
|
||||
|
||||
import com.google.gerrit.reviewdb.client.Project;
|
||||
import com.google.gwt.core.client.JavaScriptObject;
|
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package com.google.gerrit.client.config;
|
||||
package com.google.gerrit.client.info;
|
||||
|
||||
import com.google.gerrit.client.info.ChangeInfo.RevisionInfo;
|
||||
import com.google.gerrit.common.data.ParameterizedString;
|
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package com.google.gerrit.client.config;
|
||||
package com.google.gerrit.client.info;
|
||||
|
||||
import com.google.gwt.core.client.JavaScriptObject;
|
||||
|
@@ -12,7 +12,7 @@
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package com.google.gerrit.client.config;
|
||||
package com.google.gerrit.client.info;
|
||||
|
||||
import com.google.gerrit.client.rpc.NativeMap;
|
||||
import com.google.gerrit.client.rpc.NativeString;
|
@@ -25,12 +25,12 @@ import com.google.gerrit.client.api.ApiGlue;
|
||||
import com.google.gerrit.client.api.PluginLoader;
|
||||
import com.google.gerrit.client.changes.ChangeConstants;
|
||||
import com.google.gerrit.client.changes.ChangeListScreen;
|
||||
import com.google.gerrit.client.config.AuthInfo;
|
||||
import com.google.gerrit.client.config.ConfigServerApi;
|
||||
import com.google.gerrit.client.config.ServerInfo;
|
||||
import com.google.gerrit.client.documentation.DocInfo;
|
||||
import com.google.gerrit.client.info.AccountInfo;
|
||||
import com.google.gerrit.client.info.AccountPreferencesInfo;
|
||||
import com.google.gerrit.client.info.AuthInfo;
|
||||
import com.google.gerrit.client.info.ServerInfo;
|
||||
import com.google.gerrit.client.info.TopMenu;
|
||||
import com.google.gerrit.client.info.TopMenuItem;
|
||||
import com.google.gerrit.client.info.TopMenuList;
|
||||
|
@@ -16,7 +16,7 @@ package com.google.gerrit.client.admin;
|
||||
|
||||
import com.google.gerrit.client.Dispatcher;
|
||||
import com.google.gerrit.client.Gerrit;
|
||||
import com.google.gerrit.client.config.GitwebInfo;
|
||||
import com.google.gerrit.client.info.GitwebInfo;
|
||||
import com.google.gerrit.client.ui.Hyperlink;
|
||||
import com.google.gerrit.client.ui.ParentProjectBox;
|
||||
import com.google.gerrit.common.data.AccessSection;
|
||||
|
@@ -24,8 +24,8 @@ import com.google.gerrit.client.VoidResult;
|
||||
import com.google.gerrit.client.access.AccessMap;
|
||||
import com.google.gerrit.client.access.ProjectAccessInfo;
|
||||
import com.google.gerrit.client.actions.ActionButton;
|
||||
import com.google.gerrit.client.config.GitwebInfo;
|
||||
import com.google.gerrit.client.info.ActionInfo;
|
||||
import com.google.gerrit.client.info.GitwebInfo;
|
||||
import com.google.gerrit.client.info.WebLinkInfo;
|
||||
import com.google.gerrit.client.projects.BranchInfo;
|
||||
import com.google.gerrit.client.projects.ProjectApi;
|
||||
|
@@ -22,10 +22,10 @@ import com.google.gerrit.client.access.ProjectAccessInfo;
|
||||
import com.google.gerrit.client.actions.ActionButton;
|
||||
import com.google.gerrit.client.api.ExtensionPanel;
|
||||
import com.google.gerrit.client.change.Resources;
|
||||
import com.google.gerrit.client.config.DownloadInfo.DownloadCommandInfo;
|
||||
import com.google.gerrit.client.config.DownloadInfo.DownloadSchemeInfo;
|
||||
import com.google.gerrit.client.download.DownloadPanel;
|
||||
import com.google.gerrit.client.info.ActionInfo;
|
||||
import com.google.gerrit.client.info.DownloadInfo.DownloadCommandInfo;
|
||||
import com.google.gerrit.client.info.DownloadInfo.DownloadSchemeInfo;
|
||||
import com.google.gerrit.client.projects.ConfigInfo;
|
||||
import com.google.gerrit.client.projects.ConfigInfo.ConfigParameterInfo;
|
||||
import com.google.gerrit.client.projects.ConfigInfo.ConfigParameterValue;
|
||||
|
@@ -18,7 +18,7 @@ import static com.google.gerrit.common.PageLinks.ADMIN_PROJECTS;
|
||||
|
||||
import com.google.gerrit.client.Dispatcher;
|
||||
import com.google.gerrit.client.Gerrit;
|
||||
import com.google.gerrit.client.config.GitwebInfo;
|
||||
import com.google.gerrit.client.info.GitwebInfo;
|
||||
import com.google.gerrit.client.info.WebLinkInfo;
|
||||
import com.google.gerrit.client.projects.ProjectInfo;
|
||||
import com.google.gerrit.client.projects.ProjectMap;
|
||||
|
@@ -18,6 +18,7 @@ import com.google.gerrit.client.ErrorDialog;
|
||||
import com.google.gerrit.client.Gerrit;
|
||||
import com.google.gerrit.client.info.AccountInfo;
|
||||
import com.google.gerrit.client.info.AccountPreferencesInfo;
|
||||
import com.google.gerrit.client.info.ServerInfo;
|
||||
import com.google.gwt.core.client.JavaScriptObject;
|
||||
import com.google.gwt.core.client.JsArray;
|
||||
import com.google.gwt.user.client.History;
|
||||
@@ -72,6 +73,7 @@ public class ApiGlue {
|
||||
refreshMenuBar: @com.google.gerrit.client.api.ApiGlue::refreshMenuBar(),
|
||||
isSignedIn: @com.google.gerrit.client.api.ApiGlue::isSignedIn(),
|
||||
showError: @com.google.gerrit.client.api.ApiGlue::showError(Ljava/lang/String;),
|
||||
getServerInfo: @com.google.gerrit.client.api.ApiGlue::getServerInfo(),
|
||||
getCurrentUser: @com.google.gerrit.client.api.ApiGlue::getCurrentUser(),
|
||||
getUserPreferences: @com.google.gerrit.client.api.ApiGlue::getUserPreferences(),
|
||||
refreshUserPreferences: @com.google.gerrit.client.api.ApiGlue::refreshUserPreferences(),
|
||||
@@ -254,6 +256,10 @@ public class ApiGlue {
|
||||
Gerrit.display(History.getToken());
|
||||
}
|
||||
|
||||
private static final ServerInfo getServerInfo() {
|
||||
return Gerrit.info();
|
||||
}
|
||||
|
||||
private static final AccountInfo getCurrentUser() {
|
||||
return Gerrit.getUserAccountInfo();
|
||||
}
|
||||
|
@@ -50,6 +50,7 @@ final class Plugin extends JavaScriptObject {
|
||||
var G = $wnd.Gerrit;
|
||||
@com.google.gerrit.client.api.Plugin::TYPE.prototype = {
|
||||
getPluginName: function(){return this.name},
|
||||
getServerInfo: @com.google.gerrit.client.api.ApiGlue::getServerInfo(),
|
||||
getCurrentUser: @com.google.gerrit.client.api.ApiGlue::getCurrentUser(),
|
||||
getUserPreferences: @com.google.gerrit.client.api.ApiGlue::getUserPreferences(),
|
||||
refreshUserPreferences: @com.google.gerrit.client.api.ApiGlue::refreshUserPreferences(),
|
||||
|
@@ -17,9 +17,9 @@ package com.google.gerrit.client.change;
|
||||
import com.google.gerrit.client.AvatarImage;
|
||||
import com.google.gerrit.client.FormatUtil;
|
||||
import com.google.gerrit.client.Gerrit;
|
||||
import com.google.gerrit.client.config.GitwebInfo;
|
||||
import com.google.gerrit.client.info.AccountInfo;
|
||||
import com.google.gerrit.client.info.ChangeInfo;
|
||||
import com.google.gerrit.client.info.GitwebInfo;
|
||||
import com.google.gerrit.client.info.WebLinkInfo;
|
||||
import com.google.gerrit.client.info.ChangeInfo.CommitInfo;
|
||||
import com.google.gerrit.client.info.ChangeInfo.GitPerson;
|
||||
|
@@ -17,7 +17,7 @@ package com.google.gerrit.client.change;
|
||||
import com.google.gerrit.client.Gerrit;
|
||||
import com.google.gerrit.client.change.RelatedChanges.ChangeAndCommit;
|
||||
import com.google.gerrit.client.changes.Util;
|
||||
import com.google.gerrit.client.config.GitwebInfo;
|
||||
import com.google.gerrit.client.info.GitwebInfo;
|
||||
import com.google.gerrit.client.info.ChangeInfo.CommitInfo;
|
||||
import com.google.gerrit.common.PageLinks;
|
||||
import com.google.gerrit.reviewdb.client.Change;
|
||||
|
@@ -15,6 +15,7 @@
|
||||
package com.google.gerrit.client.config;
|
||||
|
||||
import com.google.gerrit.client.info.AccountPreferencesInfo;
|
||||
import com.google.gerrit.client.info.ServerInfo;
|
||||
import com.google.gerrit.client.info.TopMenuList;
|
||||
import com.google.gerrit.client.rpc.NativeMap;
|
||||
import com.google.gerrit.client.rpc.RestApi;
|
||||
|
@@ -19,10 +19,10 @@ import com.google.gerrit.client.Gerrit;
|
||||
import com.google.gerrit.client.changes.ChangeApi;
|
||||
import com.google.gerrit.client.changes.ReviewInfo;
|
||||
import com.google.gerrit.client.changes.Util;
|
||||
import com.google.gerrit.client.config.GitwebInfo;
|
||||
import com.google.gerrit.client.diff.DiffInfo.Region;
|
||||
import com.google.gerrit.client.info.ChangeInfo;
|
||||
import com.google.gerrit.client.info.FileInfo;
|
||||
import com.google.gerrit.client.info.GitwebInfo;
|
||||
import com.google.gerrit.client.info.WebLinkInfo;
|
||||
import com.google.gerrit.client.info.ChangeInfo.RevisionInfo;
|
||||
import com.google.gerrit.client.patches.PatchUtil;
|
||||
|
@@ -15,7 +15,7 @@
|
||||
package com.google.gerrit.client.download;
|
||||
|
||||
import com.google.gerrit.client.Gerrit;
|
||||
import com.google.gerrit.client.config.DownloadInfo.DownloadCommandInfo;
|
||||
import com.google.gerrit.client.info.DownloadInfo.DownloadCommandInfo;
|
||||
import com.google.gwt.aria.client.Roles;
|
||||
import com.google.gwt.event.dom.client.ClickEvent;
|
||||
import com.google.gwt.event.dom.client.ClickHandler;
|
||||
|
@@ -15,8 +15,8 @@
|
||||
package com.google.gerrit.client.download;
|
||||
|
||||
import com.google.gerrit.client.Gerrit;
|
||||
import com.google.gerrit.client.config.DownloadInfo.DownloadCommandInfo;
|
||||
import com.google.gerrit.client.config.DownloadInfo.DownloadSchemeInfo;
|
||||
import com.google.gerrit.client.info.DownloadInfo.DownloadCommandInfo;
|
||||
import com.google.gerrit.client.info.DownloadInfo.DownloadSchemeInfo;
|
||||
import com.google.gwt.user.client.ui.FlowPanel;
|
||||
import com.google.gwt.user.client.ui.InlineLabel;
|
||||
import com.google.gwtexpui.clippy.client.CopyableLabel;
|
||||
|
@@ -16,8 +16,8 @@ package com.google.gerrit.client.download;
|
||||
|
||||
import com.google.gerrit.client.Gerrit;
|
||||
import com.google.gerrit.client.account.AccountApi;
|
||||
import com.google.gerrit.client.config.DownloadInfo.DownloadSchemeInfo;
|
||||
import com.google.gerrit.client.info.AccountPreferencesInfo;
|
||||
import com.google.gerrit.client.info.DownloadInfo.DownloadSchemeInfo;
|
||||
import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DownloadScheme;
|
||||
import com.google.gwt.aria.client.Roles;
|
||||
import com.google.gwt.core.client.JavaScriptObject;
|
||||
|
@@ -17,6 +17,7 @@ package com.google.gerrit.plugin.client;
|
||||
import com.google.gerrit.client.GerritUiExtensionPoint;
|
||||
import com.google.gerrit.client.info.AccountInfo;
|
||||
import com.google.gerrit.client.info.AccountPreferencesInfo;
|
||||
import com.google.gerrit.client.info.ServerInfo;
|
||||
import com.google.gerrit.plugin.client.extension.Panel;
|
||||
import com.google.gerrit.plugin.client.screen.Screen;
|
||||
import com.google.gwt.core.client.GWT;
|
||||
@@ -66,6 +67,10 @@ public final class Plugin extends JavaScriptObject {
|
||||
public final native void refreshUserPreferences()
|
||||
/*-{ return this.refreshUserPreferences() }-*/;
|
||||
|
||||
/** @return the server info */
|
||||
public final native ServerInfo getServerInfo()
|
||||
/*-{ return this.getServerInfo() }-*/;
|
||||
|
||||
/** @return the current user */
|
||||
public final native AccountInfo getCurrentUser()
|
||||
/*-{ return this.getCurrentUser() }-*/;
|
||||
|
Reference in New Issue
Block a user