Adding "To:" field in new folders created in Private Messages

OTEMA · Apr 3, 2019 · ba397d3 · ba397d3
1 parent c5a4b6c
commit ba397d3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/...r/messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java b/...r/messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java
@@ -3970,11 +3970,7 @@ public List createDecoratedDisplay(List msg)
           dbean.setReplied(el.getReplied().booleanValue());
         }
       }
-      //Add decorate 'TO' String for sent message
-      if(PVTMSG_MODE_SENT.equals(msgNavMode))
-      {
-        dbean.setSendToStringDecorated(createDecoratedSentToDisplay(dbean)); 
-      }
+        dbean.setSendToStringDecorated(createDecoratedSentToDisplay(dbean));
 
       decLs.add(dbean) ;
     }

diff --git a/msgcntr/messageforums-app/src/webapp/jsp/privateMsg/pvtMsg.jsp b/msgcntr/messageforums-app/src/webapp/jsp/privateMsg/pvtMsg.jsp
@@ -144,7 +144,9 @@
 		     <h:outputText value="#{rcvdItems.msg.author}" rendered="#{rcvdItems.hasRead}"/>
 		     <h:outputText styleClass="unreadMsg" value="#{rcvdItems.msg.author}" rendered="#{!rcvdItems.hasRead}"/>
 		  </h:column>
-		  <h:column rendered="#{PrivateMessagesTool.selectedTopic.topic.title == 'pvt_sent'}">
+		  		  <h:column rendered="#{PrivateMessagesTool.selectedTopic.topic.title != 'pvt_received' && 
+		  PrivateMessagesTool.selectedTopic.topic.title != 'pvt_drafts' &&
+		  PrivateMessagesTool.selectedTopic.topic.title != 'pvt_deleted' }">
 		    <f:facet name="header">
 				<h:outputLink value="#" onclick="return false;"><h:outputText value="#{msgs.pvt_to}"/></h:outputLink>
 		    </f:facet>
@@ -229,7 +231,9 @@
 		     <h:outputText value="#{rcvdItems.msg.author}" rendered="#{rcvdItems.hasRead}"/>
 		     <h:outputText styleClass="unreadMsg" value="#{rcvdItems.msg.author}" rendered="#{!rcvdItems.hasRead}"/>
 		  </h:column>
-		  <h:column rendered="#{PrivateMessagesTool.selectedTopic.topic.title == 'pvt_sent'}">
+		  <h:column rendered="#{PrivateMessagesTool.selectedTopic.topic.title != 'pvt_received' && 
+		  PrivateMessagesTool.selectedTopic.topic.title != 'pvt_drafts' &&
+		  PrivateMessagesTool.selectedTopic.topic.title != 'pvt_deleted' }">
 		    <f:facet name="header">
 		       <h:outputText value="#{msgs.pvt_to}"/>
 		    </f:facet>