Index: lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -ra3da609771f1cedff31c3af15d26d6b69308fe97 -r6597e209aaa641c0750075e90a9e18245f398a98 --- lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision a3da609771f1cedff31c3af15d26d6b69308fe97) +++ lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 6597e209aaa641c0750075e90a9e18245f398a98) @@ -68,7 +68,8 @@ authoring.msg.cancel.save =Do you want to close this window without saving? authoring.msg.no.tasks.save =There must be at least one task to be saved. error.resource.item.title.blank =Title can not be blank. -error.condition.name.blank =Name can not be blank. +error.condition.name.blank =Condition name can not be blank. +error.condition.name.contains.wrong.symbol =Condition name can not contain # symbol. Please choose the name without this symbol. error.condition.duplicated.name =Duplicated name. Please choose unique one. error.condition.no.tasklistitems.selected =There are no TaskListItems selected. Please select at least one. error.upload.failed =Upload file failed: {0} Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java =================================================================== diff -u -r1ef27bf016b647ea0c2803d22f2bb4d4b3cde650 -r6597e209aaa641c0750075e90a9e18245f398a98 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java (.../TaskListConstants.java) (revision 1ef27bf016b647ea0c2803d22f2bb4d4b3cde650) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java (.../TaskListConstants.java) (revision 6597e209aaa641c0750075e90a9e18245f398a98) @@ -85,6 +85,7 @@ //error message keys public static final String ERROR_MSG_TITLE_BLANK = "error.resource.item.title.blank"; public static final String ERROR_MSG_NAME_BLANK = "error.condition.name.blank"; + public static final String ERROR_MSG_NAME_CONTAINS_WRONG_SYMBOL = "error.condition.name.contains.wrong.symbol"; public static final String ERROR_MSG_NO_TASK_LIST_ITEMS = "error.condition.no.tasklistitems.selected"; public static final String ERROR_MSG_NAME_DUPLICATED = "error.condition.duplicated.name"; public static final String ERROR_MSG_UPLOAD_FAILED = "error.upload.failed"; Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringTaskListConditionAction.java =================================================================== diff -u -r12a0e5152335f664f19ad5b1449633f7fec6b8a9 -r6597e209aaa641c0750075e90a9e18245f398a98 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringTaskListConditionAction.java (.../AuthoringTaskListConditionAction.java) (revision 12a0e5152335f664f19ad5b1449633f7fec6b8a9) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringTaskListConditionAction.java (.../AuthoringTaskListConditionAction.java) (revision 6597e209aaa641c0750075e90a9e18245f398a98) @@ -486,10 +486,14 @@ */ private ActionErrors validateTaskListCondition(TaskListConditionForm conditionForm, HttpServletRequest request) { ActionErrors errors = new ActionErrors(); - if(StringUtils.isBlank(conditionForm.getName())) { + + String formConditionName = conditionForm.getName(); + if(StringUtils.isBlank(formConditionName)) { errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(TaskListConstants.ERROR_MSG_NAME_BLANK)); + } else if (StringUtils.contains(formConditionName, '#')){ + errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(TaskListConstants.ERROR_MSG_NAME_CONTAINS_WRONG_SYMBOL)); } else { - String formConditionName = conditionForm.getName(); + String formConditionSequenceId = conditionForm.getSequenceId(); String sessionMapID = conditionForm.getSessionMapID();