From ba397d38b02b45a3d5b82f17508e71f8aec6ccf0 Mon Sep 17 00:00:00 2001
From: Daniel Merino <daniel.merino@unavarra.es>
Date: Fri, 29 Mar 2019 10:27:46 +0100
Subject: [PATCH] Adding "To:" field in new folders created in Private Messages

---
 .../tool/messageforums/PrivateMessagesTool.java           | 6 +-----
 .../src/webapp/jsp/privateMsg/pvtMsg.jsp                  | 8 ++++++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/msgcntr/messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java b/msgcntr/messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java
index 983d43ba250d..f09fe283030b 100644
--- a/msgcntr/messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java
+++ b/msgcntr/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
index 4ae7d1e31259..76f6d0e661e8 100644
--- 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>