Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20141216.sql'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java,v
diff -u -r1.38 -r1.38.2.1
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java 25 Jul 2014 13:49:34 -0000 1.38
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java 30 Dec 2014 09:44:07 -0000 1.38.2.1
@@ -90,10 +90,14 @@
private ForumUser createdBy;
private Set messages;
+
+ private int minCharacters;
+
+ private boolean limitedMinCharacters;
- private int limitedChar;
+ private int maxCharacters;
- private boolean limitedInput;
+ private boolean limitedMaxCharacters;
private boolean reflectOnActivity;
@@ -418,29 +422,53 @@
return toContent;
}
+
+ /**
+ * @hibernate.property column="min_characters"
+ * @return
+ */
+ public int getMinCharacters() {
+ return minCharacters;
+ }
+ public void setMinCharacters(int minCharacters) {
+ this.minCharacters = minCharacters;
+ }
+
/**
+ * @hibernate.property column="limited_min_characters"
+ * @return
+ */
+ public boolean isLimitedMinCharacters() {
+ return limitedMinCharacters;
+ }
+
+ public void setLimitedMinCharacters(boolean limitedMinCharacters) {
+ this.limitedMinCharacters = limitedMinCharacters;
+ }
+
+ /**
* @hibernate.property column="limited_of_chars"
* @return
*/
- public int getLimitedChar() {
- return limitedChar;
+ public int getMaxCharacters() {
+ return maxCharacters;
}
- public void setLimitedChar(int limitedChar) {
- this.limitedChar = limitedChar;
+ public void setMaxCharacters(int maxCharacters) {
+ this.maxCharacters = maxCharacters;
}
/**
* @hibernate.property column="limited_input_flag"
* @return
*/
- public boolean isLimitedInput() {
- return limitedInput;
+ public boolean isLimitedMaxCharacters() {
+ return limitedMaxCharacters;
}
- public void setLimitedInput(boolean limitedInput) {
- this.limitedInput = limitedInput;
+ public void setLimitedMaxCharacters(boolean limitedMaxCharacters) {
+ this.limitedMaxCharacters = limitedMaxCharacters;
}
/**
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.126.2.3 -r1.126.2.4
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 1 Dec 2014 22:06:08 -0000 1.126.2.3
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 30 Dec 2014 09:44:07 -0000 1.126.2.4
@@ -1124,7 +1124,7 @@
toolContentObj.setDefineLater(Boolean.FALSE);
toolContentObj.setInstructions(WebUtil.convertNewlines((String) importValues
.get(ToolContentImport102Manager.CONTENT_BODY)));
- toolContentObj.setLimitedChar(5000); // this is the default value
+ toolContentObj.setMaxCharacters(5000); // this is the default value
toolContentObj.setReflectOnActivity(Boolean.FALSE);
toolContentObj.setReflectInstructions(null);
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.61 -r1.61.2.1
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java 19 Feb 2014 21:27:43 -0000 1.61
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java 30 Dec 2014 09:44:07 -0000 1.61.2.1
@@ -82,8 +82,10 @@
public static final String ATTR_MINIMUM_RATE = "minimumRate";
public static final String ATTR_MAXIMUM_RATE = "maximumRate";
+
+ public static final String ATTR_MIN_CHARACTERS = "minCharacters";
- public static final String ATTR_LIMITED_CHARS = "limitedChars";
+ public static final String ATTR_MAX_CHARACTERS = "maxCharacters";
public static final String ATTR_LOCK_WHEN_FINISHED = "lockedWhenFinished";
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 -r1.82.2.1
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java 26 Jul 2014 07:29:56 -0000 1.82
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java 30 Dec 2014 09:44:07 -0000 1.82.2.1
@@ -865,8 +865,8 @@
if (StringUtils.equals(modeStr, ToolAccessMode.TEACHER.toString())) {
return errors;
}
- if (!form.getForum().isAllowRichEditor() && form.getForum().isLimitedInput()) {
- if (form.getForum().getLimitedChar() <= 0) {
+ if (!form.getForum().isAllowRichEditor() && form.getForum().isLimitedMaxCharacters()) {
+ if (form.getForum().getMaxCharacters() <= 0) {
ActionMessage error = new ActionMessage("error.limit.char.less.zero");
errors.add(ActionMessages.GLOBAL_MESSAGE, error);
}
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java,v
diff -u -r1.85 -r1.85.2.1
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java 19 Feb 2014 21:27:43 -0000 1.85
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java 30 Dec 2014 09:44:07 -0000 1.85.2.1
@@ -213,7 +213,8 @@
// Indicate don't restrict number of chars by allowNumber = 0
Long forumId = forum.getUid();
Boolean allowRichEditor = new Boolean(forum.isAllowRichEditor());
- int allowNumber = forum.isLimitedInput() || forum.isAllowRichEditor() ? forum.getLimitedChar() : 0;
+ int minCharacters = forum.isLimitedMinCharacters() ? forum.getMinCharacters() : 0;
+ int maxCharacters = forum.isLimitedMaxCharacters() || forum.isAllowRichEditor() ? forum.getMaxCharacters() : 0;
sessionMap.put(AttributeNames.ATTR_MODE, mode);
sessionMap.put(ForumConstants.ATTR_FORUM_ID, forumId);
@@ -229,7 +230,8 @@
sessionMap.put(ForumConstants.ATTR_MAXIMUM_RATE, forum.getMaximumRate());
sessionMap.put(ForumConstants.ATTR_ALLOW_NEW_TOPICS, forum.isAllowNewTopic());
sessionMap.put(ForumConstants.ATTR_ALLOW_RICH_EDITOR, allowRichEditor);
- sessionMap.put(ForumConstants.ATTR_LIMITED_CHARS, new Integer(allowNumber));
+ sessionMap.put(ForumConstants.ATTR_MIN_CHARACTERS, new Integer(minCharacters));
+ sessionMap.put(ForumConstants.ATTR_MAX_CHARACTERS, new Integer(maxCharacters));
sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
sessionMap.put(ForumConstants.ATTR_FORUM_TITLE, forum.getTitle());
sessionMap.put(ForumConstants.ATTR_FORUM_INSTRCUTION, forum.getInstructions());
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java,v
diff -u -r1.19 -r1.19.2.1
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java 17 Jan 2014 21:42:45 -0000 1.19
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumForm.java 30 Dec 2014 09:44:07 -0000 1.19.2.1
@@ -96,7 +96,8 @@
forum.setAllowEdit(false);
forum.setAllowAnonym(false);
forum.setAllowRichEditor(false);
- forum.setLimitedInput(false);
+ forum.setLimitedMinCharacters(false);
+ forum.setLimitedMaxCharacters(false);
forum.setLockWhenFinished(false);
forum.setAllowNewTopic(false);
forum.setAllowUpload(false);
Index: lams_tool_forum/web/common/header.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/common/header.jsp,v
diff -u -r1.13 -r1.13.2.1
--- lams_tool_forum/web/common/header.jsp 27 Jun 2014 07:26:17 -0000 1.13
+++ lams_tool_forum/web/common/header.jsp 30 Dec 2014 09:44:07 -0000 1.13.2.1
@@ -21,13 +21,4 @@
-
-
-
-
-
+
\ No newline at end of file
Index: lams_tool_forum/web/includes/learnerLayout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/includes/learnerLayout.jsp,v
diff -u -r1.6 -r1.6.12.1
--- lams_tool_forum/web/includes/learnerLayout.jsp 8 Jun 2007 01:35:33 -0000 1.6
+++ lams_tool_forum/web/includes/learnerLayout.jsp 30 Dec 2014 09:44:06 -0000 1.6.12.1
@@ -1,31 +1,44 @@
-
+
<%@ include file="/common/taglibs.jsp"%>
<%@ taglib uri="tags-tiles" prefix="tiles"%>
-
-
-
-
-
-
-
+
-
-
-
-
-
+
+ +
+ |
+
---|
+ |
+
+ |
+
- |
- - | - -
+ |
+
+ |
+ + | + +