Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java,v diff -u -r1.22 -r1.23 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 22 Nov 2005 04:01:14 -0000 1.22 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 22 Nov 2005 23:19:13 -0000 1.23 @@ -37,6 +37,7 @@ import org.lamsfoundation.lams.tool.forum.persistence.Forum; import org.lamsfoundation.lams.tool.forum.persistence.ForumDao; import org.lamsfoundation.lams.tool.forum.persistence.ForumException; +import org.lamsfoundation.lams.tool.forum.persistence.ForumReport; import org.lamsfoundation.lams.tool.forum.persistence.ForumToolSession; import org.lamsfoundation.lams.tool.forum.persistence.ForumToolSessionDao; import org.lamsfoundation.lams.tool.forum.persistence.ForumUser; @@ -323,7 +324,7 @@ } public Forum getDefaultForum(){ Long defaultForumId = getToolDefaultContentIdBySignature(ForumConstants.TOOLSIGNNATURE); - Forum defaultForum = getForum(defaultForumId); + Forum defaultForum = getForumByContentId(defaultForumId); if(defaultForum == null) { String error="Could not retrieve default content record for this tool"; @@ -535,5 +536,12 @@ this.forumToolContentHandler = toolContentHandler; } + public ForumReport getReport(Long userUid) { + ForumUser user = forumUserDao.getByUid(userUid); + if(user != null){ + return user.getReport(); + } + return null; + } } Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java,v diff -u -r1.17 -r1.18 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java 22 Nov 2005 04:01:13 -0000 1.17 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java 22 Nov 2005 23:19:13 -0000 1.18 @@ -5,6 +5,7 @@ import org.apache.struts.upload.FormFile; import org.lamsfoundation.lams.tool.forum.persistence.Attachment; import org.lamsfoundation.lams.tool.forum.persistence.Forum; +import org.lamsfoundation.lams.tool.forum.persistence.ForumReport; import org.lamsfoundation.lams.tool.forum.persistence.ForumToolSession; import org.lamsfoundation.lams.tool.forum.persistence.ForumUser; import org.lamsfoundation.lams.tool.forum.persistence.Message; @@ -201,4 +202,9 @@ * @return */ public List getUsersBySessionId(Long sessionID); + + //************************************************************************************ + // Report Method + //************************************************************************************ + public ForumReport getReport(Long userId); } Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java,v diff -u -r1.15 -r1.16 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java 15 Nov 2005 05:57:41 -0000 1.15 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java 22 Nov 2005 23:19:13 -0000 1.16 @@ -6,7 +6,7 @@ * Time: 10:33:00 */ public interface ForumConstants { - public static final String TOOLSIGNNATURE = "lafrm11"; + public static final String TOOLSIGNNATURE = "lafrum11"; public final static int MAX_FILE_SIZE = 250 * 1000; public final static String FORUM_SERVICE = "forumService";