Jira-ID: CRNT-24062

1)Added code to get userImageURL in initProcessInstanceLink() using StartingUser info in ProcessInstanceTableEntry.java
2)Removed code to display empty notes icon and show "None" text in processTableColumns.xhtml
3)Added label in views-common-messages.properties for "views.processInstanceDetailsView.noteEmpty.label"  and other Lang files.

git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@54372 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b

6 files changed, 21 insertions, 12 deletions

diff --git a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/helper/processTable/ProcessInstanceTableEntry.java b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/helper/processTable/ProcessInstanceTableEntry.java
index 2200e15..dfdb81f 100644
--- a/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/helper/processTable/ProcessInstanceTableEntry.java
+++ b/views-common/src/main/java/org/eclipse/stardust/ui/web/viewscommon/helper/processTable/ProcessInstanceTableEntry.java
@@ -41,6 +41,7 @@ import org.eclipse.stardust.ui.web.viewscommon.messages.MessagesViewsCommonBean;
 import org.eclipse.stardust.ui.web.viewscommon.utils.AuthorizationUtils;

 import org.eclipse.stardust.ui.web.viewscommon.utils.CommonDescriptorUtils;

 import org.eclipse.stardust.ui.web.viewscommon.utils.I18nUtils;

+import org.eclipse.stardust.ui.web.viewscommon.utils.MyPicturePreferenceUtils;

 import org.eclipse.stardust.ui.web.viewscommon.utils.ProcessDefinitionUtils;

 import org.eclipse.stardust.ui.web.viewscommon.utils.ProcessDescriptor;

 import org.eclipse.stardust.ui.web.viewscommon.utils.ProcessInstanceUtils;

@@ -185,6 +186,7 @@ public class ProcessInstanceTableEntry extends DefaultRowModel
 

       if (StringUtils.isNotEmpty(processInstanceLink.getComment()))

       {

+         this.noteInfo.userImageURL=MyPicturePreferenceUtils.getUsersImageURI(processInstance.getStartingUser());

          this.notePreview = processInstanceLink.getComment().substring(0,

                Math.min(processInstanceLink.getComment().length(), TEXT_PREVIEW_LENGTH));

          if (notePreview.length() < processInstanceLink.getComment().length())

@@ -481,6 +483,8 @@ public class ProcessInstanceTableEntry extends DefaultRowModel
       private boolean readOnly = true;

       

       private String type;

+      

+      private String userImageURL;

 

       public NoteInfo(Note note)

       {

@@ -586,6 +590,11 @@ public class ProcessInstanceTableEntry extends DefaultRowModel
       {

          return type;

       }

+

+      public String getUserImageURL()

+      {

+         return userImageURL;

+      }

       

       

    }

diff --git a/views-common/src/main/resources/META-INF/xhtml/processTableHelper/processTableColumns.xhtml b/views-common/src/main/resources/META-INF/xhtml/processTableHelper/processTableColumns.xhtml
index 33dae91..d76f53c 100644
--- a/views-common/src/main/resources/META-INF/xhtml/processTableHelper/processTableColumns.xhtml
+++ b/views-common/src/main/resources/META-INF/xhtml/processTableHelper/processTableColumns.xhtml
@@ -51,27 +51,23 @@
 

 		</ice:panelGroup>

 

-		<ice:panelGroup rendered="#{col.columnName == 'LinkComment'}"

-			panelTooltip="noteToolTip">

+		<ice:panelGroup rendered="#{col.columnName == 'LinkComment'}">

 			<c:set var="originalComment" value="#{row.notePreview}" />

-			<ice:panelGroup rendered="#{fn:length(originalComment) &gt; 0}">

+			<ice:panelGroup rendered="#{fn:length(originalComment) &gt; 0}" panelTooltip="noteToolTip">

 				<ice:panelGrid columns="2">

 					<ice:column>

-						<h:graphicImage

-							value="/plugins/processportal/images/icons/notes-filled.png"

-							style="border: none;" />

+						<ice:graphicImage value="#{row.noteInfo.userImageURL}" width="16px"

+							height="16px" />

 					</ice:column>

 					<ice:column>

 						<ice:outputText value="#{originalComment}" />

 					</ice:column>

 				</ice:panelGrid>

 			</ice:panelGroup>

-			<ice:panelGroup rendered="#{fn:length(originalComment) &lt; 1}">

-				<ice:panelGrid columns="1">

-					<h:graphicImage

-						value="/plugins/processportal/images/icons/notes-blank.png"

-						style="border: none;" />

-				</ice:panelGrid>

+			<ice:panelGroup rendered="#{fn:length(originalComment) &lt; 1}"

+				style="text-align:center;">

+				<ice:outputText

+					value="#{views_common_msgPropsBean['views.processInstanceDetailsView.noteEmpty.label']}" />

 			</ice:panelGroup>

 		</ice:panelGroup>

 

diff --git a/views-common/src/main/resources/views-common-messages.properties b/views-common/src/main/resources/views-common-messages.properties
index 4f6c63d..06d0ce3 100644
--- a/views-common/src/main/resources/views-common-messages.properties
+++ b/views-common/src/main/resources/views-common-messages.properties
@@ -1066,6 +1066,7 @@ views.processInstanceDetailsView.processDocumentTree.processDocuments=Process Do
 views.processInstanceDetailsView.processDocumentTree.notes=Notes

 views.processInstanceDetailsView.processDocumentTree.processAttachment=Process Attachments

 views.processInstanceDetailsView.processDocumentTree.coreDocuments=Specific Documents

+views.processInstanceDetailsView.noteEmpty.label=None

 

 # Gantt Chart View

 views.ganttChartView.label=Gantt Chart (#${viewParams.processInstanceOId})

diff --git a/views-common/src/main/resources/views-common-messages_de.properties b/views-common/src/main/resources/views-common-messages_de.properties
index 30d5d1d..93530b2 100644
--- a/views-common/src/main/resources/views-common-messages_de.properties
+++ b/views-common/src/main/resources/views-common-messages_de.properties
@@ -1064,6 +1064,7 @@ views.processInstanceDetailsView.processDocumentTree.processDocuments = Prozessd
 views.processInstanceDetailsView.processDocumentTree.notes = Notizen

 views.processInstanceDetailsView.processDocumentTree.processAttachment = Prozessanh\u00E4nge

 views.processInstanceDetailsView.processDocumentTree.coreDocuments =Besondere Dokumente

+views.processInstanceDetailsView.noteEmpty.label=+None

 

 # Gantt Chart View

 views.ganttChartView.label = Gantt Chart (\#${viewParams.processInstanceOId})

diff --git a/views-common/src/main/resources/views-common-messages_ja.properties b/views-common/src/main/resources/views-common-messages_ja.properties
index c69362d..db39c99 100644
--- a/views-common/src/main/resources/views-common-messages_ja.properties
+++ b/views-common/src/main/resources/views-common-messages_ja.properties
@@ -1064,6 +1064,7 @@ views.processInstanceDetailsView.processDocumentTree.processDocuments = \u30D7\u
 views.processInstanceDetailsView.processDocumentTree.notes = \u30CE\u30FC\u30C8

 views.processInstanceDetailsView.processDocumentTree.processAttachment = \u30D7\u30ED\u30BB\u30B9\u30A2\u30BF\u30C3\u30C1\u30E1\u30F3\u30C8

 views.processInstanceDetailsView.processDocumentTree.coreDocuments = +Specific Documents

+views.processInstanceDetailsView.noteEmpty.label=+None

 

 # Gantt Chart View

 views.ganttChartView.label = \u30AC\u30F3\u30C8\u30C1\u30E3\u30FC\u30C8(\#${viewParams.processInstanceOId})

diff --git a/views-common/src/main/resources/views-common-messages_zh_CN.properties b/views-common/src/main/resources/views-common-messages_zh_CN.properties
index a09834c..7ffe6cb 100644
--- a/views-common/src/main/resources/views-common-messages_zh_CN.properties
+++ b/views-common/src/main/resources/views-common-messages_zh_CN.properties
@@ -1064,6 +1064,7 @@ views.processInstanceDetailsView.processDocumentTree.processDocuments = \u6D41\u
 views.processInstanceDetailsView.processDocumentTree.notes = \u5907\u6CE8

 views.processInstanceDetailsView.processDocumentTree.processAttachment = \u6D41\u7A0B\u9644\u4EF6

 views.processInstanceDetailsView.processDocumentTree.coreDocuments = \u5177\u4F53\u6587\u4EF6

+views.processInstanceDetailsView.noteEmpty.label=+None

 

 # Gantt Chart View

 views.ganttChartView.label = \u6761\u72B6\u56FE(\#${viewParams.processInstanceOId})