summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2013-08-14 03:19:33 (EDT)
committerStephan Born2013-09-23 05:00:29 (EDT)
commitfe41d38e0043dbb32f2840def45fa53373b196a0 (patch)
treee59b9d00a80ba64631cbce93fe51ac3aa7ef8b02
parentb8dd1fdd9603e72d00dbaa787b6112767362b702 (diff)
downloadorg.eclipse.stardust.ui.web-fe41d38e0043dbb32f2840def45fa53373b196a0.zip
org.eclipse.stardust.ui.web-fe41d38e0043dbb32f2840def45fa53373b196a0.tar.gz
org.eclipse.stardust.ui.web-fe41d38e0043dbb32f2840def45fa53373b196a0.tar.bz2
Jira-ID: CRNT-29874
Added check on user while setting iconPath in PPUtils.getParticipantIcon() git-svn-id: https://svn.csa.sungard.com/repos/ipp2/product/trunk/stardust/ui.web@66670 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b Signed-off-by: Sidharth Singh <sidharth.singh@sungard.com>
-rw-r--r--process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/common/PPUtils.java15
1 files changed, 14 insertions, 1 deletions
diff --git a/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/common/PPUtils.java b/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/common/PPUtils.java
index 31b6310..b20bee7 100644
--- a/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/common/PPUtils.java
+++ b/process-portal/src/main/java/org/eclipse/stardust/ui/web/processportal/common/PPUtils.java
@@ -54,6 +54,8 @@ import org.eclipse.stardust.engine.api.runtime.ActivityCompletionLog;
import org.eclipse.stardust.engine.api.runtime.ActivityInstance;
import org.eclipse.stardust.engine.api.runtime.ActivityInstanceState;
import org.eclipse.stardust.engine.api.runtime.ProcessInstance;
+import org.eclipse.stardust.engine.api.runtime.User;
+import org.eclipse.stardust.engine.api.runtime.UserInfo;
import org.eclipse.stardust.engine.api.runtime.WorkflowService;
import org.eclipse.stardust.ui.client.model.ProcessFilter;
import org.eclipse.stardust.ui.client.model.ProcessFilters;
@@ -61,6 +63,7 @@ import org.eclipse.stardust.ui.event.ActivityEvent;
import org.eclipse.stardust.ui.event.WorklistSelectionEvent;
import org.eclipse.stardust.ui.web.common.app.PortalApplication;
import org.eclipse.stardust.ui.web.common.util.MessagePropertiesBean;
+import org.eclipse.stardust.ui.web.viewscommon.beans.SessionContext;
import org.eclipse.stardust.ui.web.viewscommon.common.configuration.UserPreferencesEntries;
import org.eclipse.stardust.ui.web.viewscommon.common.spi.IFilterProvider;
import org.eclipse.stardust.ui.web.viewscommon.utils.ClientContextBean;
@@ -73,6 +76,7 @@ import org.eclipse.stardust.ui.web.viewscommon.utils.ProcessWorklistCacheManager
import org.eclipse.stardust.ui.web.viewscommon.utils.ResubmissionUtils;
import org.eclipse.stardust.ui.web.viewscommon.utils.ServiceFactoryUtils;
import org.eclipse.stardust.ui.web.viewscommon.utils.SpecialWorklistCacheManager;
+import org.eclipse.stardust.ui.web.viewscommon.utils.UserUtils;
import org.eclipse.stardust.ui.web.viewscommon.utils.WorklistUtils;
import org.eclipse.stardust.ui.web.viewscommon.utils.ResubmissionUtils.ModelResubmissionActivity;
@@ -681,7 +685,16 @@ public class PPUtils
break;
case USER:
- iconPath = MyPicturePreferenceUtils.getLoggedInUsersImageURI();
+ if(participantInfo.getQualifiedId().equals(SessionContext.findSessionContext().getUser().getQualifiedId()))
+ {
+ iconPath = MyPicturePreferenceUtils.getLoggedInUsersImageURI();
+ }
+ else
+ {
+ UserInfo userInfo = (UserInfo) participantInfo;
+ User user = UserUtils.getUser(userInfo.getId());
+ iconPath = MyPicturePreferenceUtils.getUsersImageURI(user);
+ }
break;
case USERGROUP: