Oved Ourfali has uploaded a new change for review. Change subject: adding CurrentUser a getFullUserName helper function ......................................................................
adding CurrentUser a getFullUserName helper function Change-Id: Id3fac84e9c8142b683885b67b06b1d81b6418739 Signed-off-by: Oved Ourfali <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/auth/CurrentUser.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/PluginManager.java 2 files changed, 25 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/90/10190/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/auth/CurrentUser.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/auth/CurrentUser.java index 22367de..bc498cf 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/auth/CurrentUser.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/auth/CurrentUser.java @@ -25,6 +25,7 @@ private boolean loggedIn = false; private String userName; private String userId; + private String domain; // Indicates that the user should be logged in automatically private boolean autoLogin = false; @@ -52,6 +53,19 @@ */ public String getUserName() { return userName; + } + + /** + * Returns the user name in format user@domain if the user is currently logged in, {@code null} otherwise. + */ + public String getFullUserName() { + String fullUserName = userName; + if (userName != null) { + if (!userName.contains("@") && domain != null) { //$NON-NLS-1$ + fullUserName += "@" + domain; //$NON-NLS-1$ + } + } + return fullUserName; } void setUserName(String userName) { @@ -98,6 +112,7 @@ public void onUserLogin(VdcUser loggedUser) { setUserName(loggedUser.getUserName()); setUserId(loggedUser.getUserId().toString()); + setDomain(loggedUser.getDomainControler()); setLoggedIn(true); fireLoginChangeEvent(); } @@ -109,6 +124,7 @@ setUserName(null); setUserId(null); setLoggedIn(false); + setDomain(null); fireLoginChangeEvent(); } @@ -121,4 +137,12 @@ eventBus.fireEvent(event); } + public String getDomain() { + return domain; + } + + public void setDomain(String domain) { + this.domain = domain; + } + } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/PluginManager.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/PluginManager.java index 4f1b2fa..15decd8 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/PluginManager.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/PluginManager.java @@ -430,7 +430,7 @@ }, loginUserName: function() { if (canDoPluginAction(this.pluginName)) { - return [email protected]::getUserName()(); + return [email protected]::getFullUserName()(); } }, loginUserId: function() { -- To view, visit http://gerrit.ovirt.org/10190 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id3fac84e9c8142b683885b67b06b1d81b6418739 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Oved Ourfali <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
