summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2013-02-06 08:37:40 (EST)
committer Sven Rottstock2013-03-11 06:34:42 (EDT)
commitc8715d9894d627c87956d9d27ffa4bd2ac874f67 (patch)
tree19cb5ebca96c14ca104f377d4cdd2393762601c9
parent714ebbd7d81ca74535f0d7f654b101f7da8516c0 (diff)
downloadorg.eclipse.stardust.ui.web-c8715d9894d627c87956d9d27ffa4bd2ac874f67.zip
org.eclipse.stardust.ui.web-c8715d9894d627c87956d9d27ffa4bd2ac874f67.tar.gz
org.eclipse.stardust.ui.web-c8715d9894d627c87956d9d27ffa4bd2ac874f67.tar.bz2
Jira-ID: CRNT-27174
Added code to fetch user preference for user for accountName in LogTableEntry git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@62799 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/LogTableEntry.java13
1 files changed, 11 insertions, 2 deletions
diff --git a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/LogTableEntry.java b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/LogTableEntry.java
index 0921bc2..56d51eb 100644
--- a/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/LogTableEntry.java
+++ b/admin-portal/src/main/java/org/eclipse/stardust/ui/web/admin/views/LogTableEntry.java
@@ -18,6 +18,7 @@ import org.eclipse.stardust.engine.api.runtime.LogType;
import org.eclipse.stardust.engine.api.runtime.User;
import org.eclipse.stardust.ui.web.admin.messages.AdminMessagesPropertiesBean;
import org.eclipse.stardust.ui.web.common.table.DefaultRowModel;
+import org.eclipse.stardust.ui.web.viewscommon.beans.SessionContext;
import org.eclipse.stardust.ui.web.viewscommon.utils.UserUtils;
/**
@@ -89,8 +90,16 @@ public class LogTableEntry extends DefaultRowModel
{
linkDisabled = true;
}
-
- accountName = UserUtils.getUserDisplayLabel(user);
+ User loggedInUser = SessionContext.findSessionContext().getUser();
+ if (!user.getAccount().equals(loggedInUser.getAccount()))
+ {
+ UserUtils.loadDisplayPreferenceForUser(user);
+ accountName = UserUtils.getUserDisplayLabel(user);
+ }
+ else
+ {
+ accountName = UserUtils.getUserDisplayLabel(loggedInUser);
+ }
if (!linkDisabled && StringUtils.isNotEmpty(accountName))
{