Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java =================================================================== diff -u -r704cc16d46e5a435fceaf9755bec41593613f8ca -r2b40643d409f3d7066e3e9505bc02994a4139542 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision 704cc16d46e5a435fceaf9755bec41593613f8ca) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision 2b40643d409f3d7066e3e9505bc02994a4139542) @@ -72,6 +72,9 @@ import org.lamsfoundation.lams.tool.forum.web.forms.ForumPedagogicalPlannerForm; import org.lamsfoundation.lams.tool.forum.web.forms.MessageForm; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +import org.lamsfoundation.lams.util.Configuration; +import org.lamsfoundation.lams.util.ConfigurationKeys; +import org.lamsfoundation.lams.util.FileValidatorUtil; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; @@ -186,6 +189,9 @@ forumForm.setContentFolderID(contentFolderID); sessionMap.put(AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID); + sessionMap.put(ForumConstants.ATTR_UPLOAD_MAX_FILE_SIZE, + FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))); + // get back the topic list and display them on page forumService = getForumManager(); Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java =================================================================== diff -u -rc1bc94e82ed876ec01e06173c8e4edfdd024253c -r2b40643d409f3d7066e3e9505bc02994a4139542 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java (.../LearningAction.java) (revision c1bc94e82ed876ec01e06173c8e4edfdd024253c) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java (.../LearningAction.java) (revision 2b40643d409f3d7066e3e9505bc02994a4139542) @@ -233,7 +233,14 @@ sessionMap.put(ForumConstants.ATTR_LOCK_WHEN_FINISHED, forum.getLockWhenFinished()); sessionMap.put(ForumConstants.ATTR_USER_FINISHED, forumUser.isSessionFinished()); sessionMap.put(ForumConstants.ATTR_ALLOW_EDIT, forum.isAllowEdit()); + sessionMap.put(ForumConstants.ATTR_ALLOW_UPLOAD, forum.isAllowUpload()); + int uploadMaxFileSize = Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE); + // it defaults to -1 if property was not found + if (uploadMaxFileSize > 0) { + sessionMap.put(ForumConstants.ATTR_UPLOAD_MAX_FILE_SIZE, FileValidatorUtil.formatSize(uploadMaxFileSize)); + } + sessionMap.put(ForumConstants.ATTR_ALLOW_RATE_MESSAGES, forum.isAllowRateMessages()); sessionMap.put(ForumConstants.ATTR_MINIMUM_RATE, forum.getMinimumRate()); sessionMap.put(ForumConstants.ATTR_MAXIMUM_RATE, forum.getMaximumRate()); @@ -765,12 +772,6 @@ boolean hideReflection = WebUtil.readBooleanParam(request, ForumConstants.ATTR_HIDE_REFLECTION, false); sessionMap.put(ForumConstants.ATTR_HIDE_REFLECTION, hideReflection); - int uploadMaxFileSize = Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_MAX_SIZE); - // it defaults to -1 if property was not found - if (uploadMaxFileSize > 0) { - sessionMap.put(ForumConstants.ATTR_UPLOAD_MAX_FILE_SIZE, FileValidatorUtil.formatSize(uploadMaxFileSize)); - } - return mapping.findForward("success"); } Index: lams_tool_forum/web/jsps/authoring/message/create.jsp =================================================================== diff -u -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271 -r2b40643d409f3d7066e3e9505bc02994a4139542 --- lams_tool_forum/web/jsps/authoring/message/create.jsp (.../create.jsp) (revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271) +++ lams_tool_forum/web/jsps/authoring/message/create.jsp (.../create.jsp) (revision 2b40643d409f3d7066e3e9505bc02994a4139542) @@ -38,6 +38,11 @@

+

+ + ${sessionMap.uploadMaxFileSize} + +

Index: lams_tool_forum/web/jsps/authoring/parts/msgattachment.jsp =================================================================== diff -u -rbe49e45de128eb0d25eb224ff397590993eccc82 -r2b40643d409f3d7066e3e9505bc02994a4139542 --- lams_tool_forum/web/jsps/authoring/parts/msgattachment.jsp (.../msgattachment.jsp) (revision be49e45de128eb0d25eb224ff397590993eccc82) +++ lams_tool_forum/web/jsps/authoring/parts/msgattachment.jsp (.../msgattachment.jsp) (revision 2b40643d409f3d7066e3e9505bc02994a4139542) @@ -26,5 +26,11 @@ +

+ + ${sessionMap.uploadMaxFileSize} + +

+
Index: lams_tool_forum/web/jsps/learning/message/topicform.jsp =================================================================== diff -u -r80cfd81a864da36f134b18b403a6f8b06ab2d013 -r2b40643d409f3d7066e3e9505bc02994a4139542 --- lams_tool_forum/web/jsps/learning/message/topicform.jsp (.../topicform.jsp) (revision 80cfd81a864da36f134b18b403a6f8b06ab2d013) +++ lams_tool_forum/web/jsps/learning/message/topicform.jsp (.../topicform.jsp) (revision 2b40643d409f3d7066e3e9505bc02994a4139542) @@ -15,6 +15,11 @@


+

+ + ${sessionMap.uploadMaxFileSize} + +

Index: lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp =================================================================== diff -u -r80cfd81a864da36f134b18b403a6f8b06ab2d013 -r2b40643d409f3d7066e3e9505bc02994a4139542 --- lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp (.../topicreplyform.jsp) (revision 80cfd81a864da36f134b18b403a6f8b06ab2d013) +++ lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp (.../topicreplyform.jsp) (revision 2b40643d409f3d7066e3e9505bc02994a4139542) @@ -16,11 +16,11 @@ -
+

${sessionMap.uploadMaxFileSize} -

+