SOS-1715 Comments made in Activities for documents are placed in Prev…

…ious Comments
JorgeFerrer · Sep 6, 2013 · 247c6bd · 247c6bd
1 parent 2778bd2
commit 247c6bd
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 8 deletions.
diff --git a/...s/so-portlet/docroot/WEB-INF/src/com/liferay/so/activities/portlet/ActivitiesPortlet.java b/...s/so-portlet/docroot/WEB-INF/src/com/liferay/so/activities/portlet/ActivitiesPortlet.java
@@ -39,6 +39,8 @@
 import com.liferay.portal.service.UserLocalServiceUtil;
 import com.liferay.portal.theme.ThemeDisplay;
 import com.liferay.portlet.documentlibrary.model.DLFileEntry;
+import com.liferay.portlet.documentlibrary.model.DLFileVersion;
+import com.liferay.portlet.documentlibrary.service.DLFileVersionLocalServiceUtil;
 import com.liferay.portlet.messageboards.model.MBMessage;
 import com.liferay.portlet.messageboards.model.MBMessageDisplay;
 import com.liferay.portlet.messageboards.model.MBThread;
@@ -48,6 +50,7 @@
 import com.liferay.portlet.messageboards.util.comparator.MessageCreateDateComparator;
 import com.liferay.portlet.social.model.SocialActivitySet;
 import com.liferay.portlet.social.service.SocialActivitySetLocalServiceUtil;
+import com.liferay.so.activities.util.SocialActivityKeyConstants;
 import com.liferay.util.bridges.mvc.MVCPortlet;
 
 import java.io.IOException;
@@ -81,11 +84,23 @@ public void getMBComments(
 		String className = activitySet.getClassName();
 		long classPK = activitySet.getClassPK();
 
-		if ((activitySet.getActivityCount() > 1 ) &&
-			className.equals(DLFileEntry.class.getName())) {
+		if (className.equals(DLFileEntry.class.getName())) {
+			if ((activitySet.getActivityCount() > 1 ) &&
+				(activitySet.getType() ==
+					SocialActivityKeyConstants.DL_ADD_FILE_ENTRY)) {
 
-			className = SocialActivitySet.class.getName();
-			classPK = activitySet.getActivitySetId();
+				className = SocialActivitySet.class.getName();
+				classPK = activitySet.getActivitySetId();
+			}
+			else {
+				className = DLFileVersion.class.getName();
+
+				DLFileVersion dlFileVersion =
+					DLFileVersionLocalServiceUtil.getLatestFileVersion(
+						classPK, false);
+
+				classPK = dlFileVersion.getFileVersionId();
+			}
 		}
 
 		MBMessageDisplay mbMessageDisplay =

diff --git a/portlets/so-portlet/docroot/activities/init.jsp b/portlets/so-portlet/docroot/activities/init.jsp
@@ -25,12 +25,15 @@ page import="com.liferay.microblogs.service.MicroblogsEntryLocalServiceUtil" %><
 page import="com.liferay.portal.kernel.util.Time" %><%@
 page import="com.liferay.portal.service.ServiceContextFactory" %><%@
 page import="com.liferay.portlet.documentlibrary.model.DLFileEntry" %><%@
+page import="com.liferay.portlet.documentlibrary.model.DLFileVersion" %><%@
+page import="com.liferay.portlet.documentlibrary.service.DLFileVersionLocalServiceUtil" %><%@
 page import="com.liferay.portlet.messageboards.model.MBMessage" %><%@
 page import="com.liferay.portlet.messageboards.service.MBMessageLocalServiceUtil" %><%@
 page import="com.liferay.portlet.social.model.SocialActivity" %><%@
 page import="com.liferay.portlet.social.model.SocialActivitySet" %><%@
 page import="com.liferay.portlet.social.service.SocialActivityLocalServiceUtil" %><%@
-page import="com.liferay.portlet.social.service.SocialActivitySetLocalServiceUtil" %>
+page import="com.liferay.portlet.social.service.SocialActivitySetLocalServiceUtil" %><%@
+page import="com.liferay.so.activities.util.SocialActivityKeyConstants" %>
 
 <%
 String tabs1 = ParamUtil.getString(request, "tabs1", "all");

diff --git a/portlets/so-portlet/docroot/activities/view_activity_sets_feed.jspf b/portlets/so-portlet/docroot/activities/view_activity_sets_feed.jspf
@@ -71,9 +71,18 @@ for (SocialActivitySet activitySet : results) {
 						String className = activitySet.getClassName();
 						long classPK = activitySet.getClassPK();
 
-						if ((activitySet.getActivityCount() > 1 ) && className.equals(DLFileEntry.class.getName())) {
-							className = SocialActivitySet.class.getName();
-							classPK = activitySet.getActivitySetId();
+						if (className.equals(DLFileEntry.class.getName())) {
+							if ((activitySet.getActivityCount() > 1) && (activitySet.getType() == SocialActivityKeyConstants.DL_ADD_FILE_ENTRY)) {
+								className = SocialActivitySet.class.getName();
+								classPK = activitySet.getActivitySetId();
+							}
+							else {
+								className = DLFileVersion.class.getName();
+
+								DLFileVersion dlFileVersion = DLFileVersionLocalServiceUtil.getLatestFileVersion(classPK, false);
+
+								classPK = dlFileVersion.getFileVersionId();
+							}
 						}
 
 						if (className.equals(MicroblogsEntry.class.getName())) {