[jboss-svn-commits] JBL Code SVN: r9935 - in labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui: view and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Mar 3 12:51:12 EST 2007
Author: unibrew
Date: 2007-03-03 12:51:12 -0500 (Sat, 03 Mar 2007)
New Revision: 9935
Modified:
labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java
labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/ThemeHelper.java
labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/view/ViewCategory.java
Log:
[JBFORUMS-181] Showing forums/topics with new posts by changing forum/topic icon now works.
Modified: labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java
===================================================================
--- labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java 2007-03-03 17:48:48 UTC (rev 9934)
+++ labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java 2007-03-03 17:51:12 UTC (rev 9935)
@@ -412,6 +412,10 @@
try
{
User user = PortalUtil.getUser();
+ if (user == null)
+ {
+ return null;
+ }
String property = PortalUtil.userProperty(user.getProperties(), "INFO_USER_LAST_LOGIN_DATE");
Calendar calendar = Calendar.getInstance();
calendar.setTimeInMillis(Long.parseLong(property));
Modified: labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/ThemeHelper.java
===================================================================
--- labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/ThemeHelper.java 2007-03-03 17:48:48 UTC (rev 9934)
+++ labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/ThemeHelper.java 2007-03-03 17:51:12 UTC (rev 9935)
@@ -211,6 +211,15 @@
*
* @return
*/
+ public String getResourceForumNewURL()
+ {
+ return this.theme.resourceForumNewURL;
+ }
+
+ /**
+ *
+ * @return
+ */
public String getResourceForumLockedURL()
{
return this.theme.resourceForumLockedURL;
Modified: labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/view/ViewCategory.java
===================================================================
--- labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/view/ViewCategory.java 2007-03-03 17:48:48 UTC (rev 9934)
+++ labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/view/ViewCategory.java 2007-03-03 17:51:12 UTC (rev 9935)
@@ -26,17 +26,18 @@
import java.util.Map;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Date;
-import org.hibernate.Hibernate;
-
import org.jboss.portlet.forums.ForumsModule;
import org.jboss.portlet.forums.model.Category;
import org.jboss.portlet.forums.model.Forum;
+import org.jboss.portlet.forums.model.Post;
import org.jboss.portlet.forums.ui.BaseController;
import org.jboss.portlet.forums.ui.ThemeHelper;
import org.jboss.portlet.forums.ui.Constants;
import org.jboss.portlet.forums.ui.JSFUtil;
import org.jboss.portlet.forums.ui.ForumUtil;
+import org.jboss.portlet.forums.ui.PortalUtil;
//jsf imports
@@ -207,6 +208,7 @@
*/
private void processCategory(Category category) throws Exception
{
+ Date userLastLogin = PortalUtil.getUserLastLoginDate();
if(category!=null)
{
this.getCategories().add(category);
@@ -223,6 +225,16 @@
//setup folderLook based on whats specified in the theme
String folderImage = ThemeHelper.getInstance().getResourceForumURL();
String folderAlt = "No_new_posts"; //bundle key
+ if (this.forumLastPosts!=null && this.forumLastPosts.containsKey(currentForum.getId()))
+ {
+ Post lastPost = (Post)this.forumLastPosts.get(currentForum.getId());
+ Date lastPostDate = lastPost.getCreateDate();
+ if (lastPostDate!=null && userLastLogin!=null && lastPostDate.compareTo(userLastLogin)>0)
+ {
+ folderAlt = "New_posts"; //bundle key
+ folderImage = ThemeHelper.getInstance().getResourceForumNewURL();
+ }
+ }
if (currentForum.getStatus() == Constants.FORUM_LOCKED)
{
folderImage = ThemeHelper.getInstance().getResourceForumLockedURL();
More information about the jboss-svn-commits
mailing list