Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java,v diff -u -r1.10 -r1.11 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java 24 Apr 2006 12:57:15 -0000 1.10 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java 24 Apr 2006 15:17:00 -0000 1.11 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java,v diff -u -r1.10 -r1.11 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java 24 Apr 2006 13:10:16 -0000 1.10 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java 24 Apr 2006 15:17:00 -0000 1.11 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java,v diff -u -r1.7 -r1.8 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java 24 Apr 2006 12:57:15 -0000 1.7 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java 24 Apr 2006 15:17:00 -0000 1.8 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/BasicContent.jsp,v diff -u -r1.9 -r1.10 --- lams_tool_vote/web/authoring/BasicContent.jsp 19 Apr 2006 12:37:00 -0000 1.9 +++ lams_tool_vote/web/authoring/BasicContent.jsp 24 Apr 2006 15:17:00 -0000 1.10 @@ -39,6 +39,9 @@ images/success.gif" align="left" width=20 height=20> + + images/error.jpg" align="left" width=20 height=20> +