Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java =================================================================== diff -u -r27a3ba4f41698f83ce6320d5b855329b1addd5eb -r13e8a854b878342109ba1b3f778e508934917115 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java (.../QaAppConstants.java) (revision 27a3ba4f41698f83ce6320d5b855329b1addd5eb) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java (.../QaAppConstants.java) (revision 13e8a854b878342109ba1b3f778e508934917115) @@ -103,6 +103,7 @@ public static final String RICHTEXT_ONLINEINSTRUCTIONS ="richTextOnlineInstructions"; public static final String RICHTEXT_TITLE ="richTextTitle"; public static final String RICHTEXT_INSTRUCTIONS ="richTextInstructions"; + public static final String RICHTEXT_BLANK ="
"; /** Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java =================================================================== diff -u -rab01f4417489f903865c8629d5256d7eed0736e5 -r13e8a854b878342109ba1b3f778e508934917115 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java (.../QAction.java) (revision ab01f4417489f903865c8629d5256d7eed0736e5) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java (.../QAction.java) (revision 13e8a854b878342109ba1b3f778e508934917115) @@ -309,13 +309,18 @@ * full form validation should be performed only in standard authoring mode, but not in monitoring EditActivity */ - if ((qaAuthoringForm.getTitle() == null) || (qaAuthoringForm.getTitle().length() == 0)) + String richTextTitle=(String) request.getSession().getAttribute(RICHTEXT_TITLE); + logger.debug("richTextTitle: " + richTextTitle); + String richTextInstructions=(String) request.getSession().getAttribute(RICHTEXT_INSTRUCTIONS); + logger.debug("richTextInstructions: " + richTextInstructions); + + if ((richTextTitle == null) || (richTextTitle.length() == 0) || richTextTitle.equalsIgnoreCase(RICHTEXT_BLANK)) { errors.add(Globals.ERROR_KEY,new ActionMessage("error.title")); logger.debug("add title to ActionMessages"); } - if ((qaAuthoringForm.getInstructions() == null) || (qaAuthoringForm.getInstructions().length() == 0)) + if ((richTextInstructions == null) || (richTextInstructions.length() == 0) || richTextInstructions.equalsIgnoreCase(RICHTEXT_BLANK)) { errors.add(Globals.ERROR_KEY, new ActionMessage("error.instructions")); logger.debug("add instructions to ActionMessages: "); Index: lams_tool_laqa/web/BasicContent.jsp =================================================================== diff -u -r27a3ba4f41698f83ce6320d5b855329b1addd5eb -r13e8a854b878342109ba1b3f778e508934917115 --- lams_tool_laqa/web/BasicContent.jsp (.../BasicContent.jsp) (revision 27a3ba4f41698f83ce6320d5b855329b1addd5eb) +++ lams_tool_laqa/web/BasicContent.jsp (.../BasicContent.jsp) (revision 13e8a854b878342109ba1b3f778e508934917115) @@ -89,23 +89,32 @@ -
|
-
- |
+ |
+
+ |
|
-
- |
- |
+
+ |
+
Index: lams_tool_laqa/web/MonitoringInstructionsScreen.jsp
===================================================================
diff -u -rdbc459a54a0eb6961b4c331f3174cc1fa4661f02 -r13e8a854b878342109ba1b3f778e508934917115
--- lams_tool_laqa/web/MonitoringInstructionsScreen.jsp (.../MonitoringInstructionsScreen.jsp) (revision dbc459a54a0eb6961b4c331f3174cc1fa4661f02)
+++ lams_tool_laqa/web/MonitoringInstructionsScreen.jsp (.../MonitoringInstructionsScreen.jsp) (revision 13e8a854b878342109ba1b3f778e508934917115)
@@ -26,21 +26,32 @@
- |
-
- |
-
- |
-
- |
-
+ |
+
+ |
+
+ |
+
+ |
+