Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java
===================================================================
diff -u -r261d9a36d11a99322125fa55faaddffc16a041b3 -ref8f09db59538abcd66af0c7528b4bdf5c43248d
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java (.../VoteAppConstants.java) (revision 261d9a36d11a99322125fa55faaddffc16a041b3)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java (.../VoteAppConstants.java) (revision ef8f09db59538abcd66af0c7528b4bdf5c43248d)
@@ -274,4 +274,5 @@
public static final String USER_EXCEPTION_WEIGHT_MUST_EQUAL100 ="userExceptionWeightMustEqual100";
public static final String USER_EXCEPTION_SINGLE_OPTION ="userExceptionSingleOption";
public static final String USER_EXCEPTION_OPTIONS_DUPLICATE ="userExceptionOptionsDuplicate";
+ public static final String USER_EXCEPTION_MAXNOMINATION_INVALID ="userExceptionMaxNominationInvalid";
}
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java
===================================================================
diff -u -rd753b209cbc5f2a8e105e111b12143222eed8761 -ref8f09db59538abcd66af0c7528b4bdf5c43248d
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java (.../VoteAction.java) (revision d753b209cbc5f2a8e105e111b12143222eed8761)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java (.../VoteAction.java) (revision ef8f09db59538abcd66af0c7528b4bdf5c43248d)
@@ -262,11 +262,9 @@
request.getSession().removeAttribute(USER_EXCEPTION_OPTIONS_DUPLICATE);
if (verifyDuplicatesOptionsMap == false)
{
- errors= new ActionMessages();
- errors.add(Globals.ERROR_KEY,new ActionMessage("error.options.duplicate"));
request.getSession().setAttribute(USER_EXCEPTION_OPTIONS_DUPLICATE, new Boolean(true).toString());
logger.debug("add error.options.duplicate to ActionMessages");
- saveErrors(request,errors);
+ persistError(request,"error.options.duplicate");
voteAuthoringForm.resetUserAction();
return (mapping.findForward(LOAD_QUESTIONS));
}
@@ -286,10 +284,8 @@
if (maxNomCount.equals("0"))
{
- errors= new ActionMessages();
- errors.add(Globals.ERROR_KEY,new ActionMessage("error.maxNominationCount.invalid"));
- logger.debug("add error.maxNominationCount.invalid to ActionMessages");
- saveErrors(request,errors);
+ request.setAttribute(USER_EXCEPTION_MAXNOMINATION_INVALID, new Boolean(true).toString());
+ persistError(request,"error.maxNominationCount.invalid");
voteAuthoringForm.resetUserAction();
return (mapping.findForward(LOAD_QUESTIONS));
}
@@ -301,9 +297,8 @@
}
catch(NumberFormatException e)
{
- errors= new ActionMessages();
- errors.add(Globals.ERROR_KEY,new ActionMessage("error.maxNominationCount.invalid"));
- saveErrors(request,errors);
+ request.setAttribute(USER_EXCEPTION_MAXNOMINATION_INVALID, new Boolean(true).toString());
+ persistError(request,"error.maxNominationCount.invalid");
voteAuthoringForm.resetUserAction();
return (mapping.findForward(LOAD_QUESTIONS));
}
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java
===================================================================
diff -u -r261d9a36d11a99322125fa55faaddffc16a041b3 -ref8f09db59538abcd66af0c7528b4bdf5c43248d
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java (.../VoteLearningAction.java) (revision 261d9a36d11a99322125fa55faaddffc16a041b3)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java (.../VoteLearningAction.java) (revision ef8f09db59538abcd66af0c7528b4bdf5c43248d)
@@ -316,7 +316,7 @@
logger.debug("intMaxNominationCount: " + intMaxNominationCount);
- int nominationCount=voteService.getLastNominationCount(voteQueUsr.getQueUsrId());
+ int nominationCount=voteService.getLastNominationCount(voteQueUsr.getUid());
logger.debug("current nominationCount: " + nominationCount);
Index: lams_tool_vote/web/authoring/BasicContent.jsp
===================================================================
diff -u -rf9e3bb1e954f24078531d9a9114952f84cad4bb2 -ref8f09db59538abcd66af0c7528b4bdf5c43248d
--- lams_tool_vote/web/authoring/BasicContent.jsp (.../BasicContent.jsp) (revision f9e3bb1e954f24078531d9a9114952f84cad4bb2)
+++ lams_tool_vote/web/authoring/BasicContent.jsp (.../BasicContent.jsp) (revision ef8f09db59538abcd66af0c7528b4bdf5c43248d)
@@ -39,6 +39,9 @@
images/success.gif" align="left" width=20 height=20>
+
+
images/error.jpg" align="left" width=20 height=20>
+