Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java =================================================================== diff -u -r811003bdaefc92c8f7ddc49a1caaa9116cb8f729 -r571f2ab387faa6dcfcbb0c10c3642e3e63a17c85 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 811003bdaefc92c8f7ddc49a1caaa9116cb8f729) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 571f2ab387faa6dcfcbb0c10c3642e3e63a17c85) @@ -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 =================================================================== diff -u -r811003bdaefc92c8f7ddc49a1caaa9116cb8f729 -r571f2ab387faa6dcfcbb0c10c3642e3e63a17c85 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java (.../IForumService.java) (revision 811003bdaefc92c8f7ddc49a1caaa9116cb8f729) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java (.../IForumService.java) (revision 571f2ab387faa6dcfcbb0c10c3642e3e63a17c85) @@ -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 =================================================================== diff -u -r6847f3627bbb8393b88988cae6c3cd8ad97f1600 -r571f2ab387faa6dcfcbb0c10c3642e3e63a17c85 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java (.../ForumConstants.java) (revision 6847f3627bbb8393b88988cae6c3cd8ad97f1600) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java (.../ForumConstants.java) (revision 571f2ab387faa6dcfcbb0c10c3642e3e63a17c85) @@ -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";