Index: lams_tool_forum/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/conf/language/lams/ApplicationResources.properties,v diff -u -r1.55.2.14 -r1.55.2.15 --- lams_tool_forum/conf/language/lams/ApplicationResources.properties 25 Jun 2016 05:07:34 -0000 1.55.2.14 +++ lams_tool_forum/conf/language/lams/ApplicationResources.properties 21 Nov 2016 00:51:37 -0000 1.55.2.15 @@ -136,6 +136,8 @@ label.authoring.advance.no.minimum =No minimum label.authoring.advance.no.maximum =No maximum error.min.less.max =The maximum number of posts must be greater than or equal to the minimum number of posts. +error.min.post.char.less=The maximum number of characters per posting must be greater than minimum number of characters per posting. +error.min.rate.less.max=The maximum number of ratings must be greater than minimum ratings. error.limit.char.less.zero =Limitation of input characters must be greater zero. error.less.mini.post =You must contribute at least {0} posts in each topic before finish. error.must.have.topic =Please add at least 1 topic when "allow learners to create new topics" option is off. @@ -227,6 +229,8 @@ label.rateLimits.forum.reminder.min =You must rate at least {0} postings. label.rateLimits.forum.reminder.max =You can only rate up to {0} postings. js.error.validate.number =There is an error with the minimum and/or maximum set for ratings. Please check and try again. +js.error.validate.posting.number =There is an error with the minimum and/or maximum set for postings. Please check and try again. +js.error.validate.reply.number = There is an error with the minimum and/or maximum number of posts per learner per thread. label.rateLimits.topic.reminder =You have rated {0} postings already. info.minimum.number.characters =The minimum number of characters for your response is {0}. warn.minimum.number.characters =You need to enter {0} characters more to proceed. Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java,v diff -u -r1.82.2.5 -r1.82.2.6 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java 11 May 2016 07:15:00 -0000 1.82.2.5 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java 21 Nov 2016 00:50:51 -0000 1.82.2.6 @@ -859,14 +859,39 @@ ActionMessage error = new ActionMessage("error.limit.char.less.zero"); errors.add(ActionMessages.GLOBAL_MESSAGE, error); } + }if (!form.getForum().isAllowRichEditor()) { + if (form.getForum().getMaxCharacters() != 0 + && form.getForum().getMaxCharacters() < form.getForum().getMinCharacters()) { + ActionMessage error = new ActionMessage("error.min.post.char.less"); + errors.add(ActionMessages.GLOBAL_MESSAGE, error); + } } + if (form.getForum().isAllowRateMessages()) { + if (form.getForum().getMaximumRate() <= 0) { + ActionMessage error = new ActionMessage("error.limit.char.less.zero"); + errors.add(ActionMessages.GLOBAL_MESSAGE, error); + } + }if (form.getForum().isAllowRateMessages()) { + if (form.getForum().getMaximumRate() != 0 + && form.getForum().getMaximumRate() < form.getForum().getMinimumRate()) { + ActionMessage error = new ActionMessage("error.min.rate.less.max"); + errors.add(ActionMessages.GLOBAL_MESSAGE, error); + } + } + if (!form.getForum().isAllowNewTopic()) { if (form.getForum().getMaximumReply() != 0 && form.getForum().getMaximumReply() < form.getForum().getMinimumReply()) { ActionMessage error = new ActionMessage("error.min.less.max"); errors.add(ActionMessages.GLOBAL_MESSAGE, error); } } + if (!form.getForum().isAllowNewTopic()) { + if (form.getForum().getMaximumReply() <= 0) { + ActionMessage error = new ActionMessage("error.limit.char.less.zero"); + errors.add(ActionMessages.GLOBAL_MESSAGE, error); + } + } } catch (Exception e) { AuthoringAction.log.error(e.toString()); Index: lams_tool_forum/web/jsps/authoring/advance.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/advance.jsp,v diff -u -r1.31.2.10 -r1.31.2.11 --- lams_tool_forum/web/jsps/authoring/advance.jsp 14 Nov 2016 08:50:34 -0000 1.31.2.10 +++ lams_tool_forum/web/jsps/authoring/advance.jsp 21 Nov 2016 00:49:07 -0000 1.31.2.11 @@ -6,143 +6,184 @@ -
- -
+
+ +
-
- -
+
+ +
-
- -
+
+ +
-
- - -
+
+ +
-
- - -
+
+ +
- -
- -
+ +
+ +
-
-
- - - +
+
+ +
+
+ +
-
- - + + + + +
+
-
- - - -
- -
- -
- -
- -
-
- - - +
+
-
- - + +
+
+ +
+
+ +
-
+ - -
- -
-
- +
+ +
+
+ +
+
+ +
+
-
- -
-
-
-
- -
+
+ +
-
- -
+
+ +
-
- -
-
- -
+
+ +
+
+ +
- + ra.onkeyup = turnOnRefect; +