Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java
===================================================================
diff -u -rfadef2b7b1f00478057ecade707ca37aa24ebe15 -r24757442203ab054339af87ac1128fd737781c63
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java (.../VoteUtils.java) (revision fadef2b7b1f00478057ecade707ca37aa24ebe15)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java (.../VoteUtils.java) (revision 24757442203ab054339af87ac1128fd737781c63)
@@ -203,6 +203,8 @@
voteGeneralAuthoringDTO.setOnlineInstructions(defaultVoteContent.getOnlineInstructions());
voteGeneralAuthoringDTO.setOfflineInstructions(defaultVoteContent.getOfflineInstructions());
+ voteAuthoringForm.setReflect(defaultVoteContent.isReflect()?"1":"0");
+
String maxNomcount= defaultVoteContent.getMaxNominationCount();
logger.debug("maxNomcount: " + maxNomcount);
if (maxNomcount.equals(""))
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java
===================================================================
diff -u -rfadef2b7b1f00478057ecade707ca37aa24ebe15 -r24757442203ab054339af87ac1128fd737781c63
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision fadef2b7b1f00478057ecade707ca37aa24ebe15)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision 24757442203ab054339af87ac1128fd737781c63)
@@ -878,9 +878,13 @@
String allowTextEntry=voteAuthoringForm.getAllowText();
logger.debug("allowTextEntry: " + allowTextEntry);
- String reflect=voteAuthoringForm.getReflect();
- logger.debug("reflect: " + reflect);
+ //String reflect=voteAuthoringForm.getReflect();
+ //logger.debug("reflect: " + reflect);
+ String reflect=request.getParameter(REFLECT);
+ logger.debug("reflect: " + reflect);
+
+
String reflectionSubject=voteAuthoringForm.getReflectionSubject();
logger.debug("reflectionSubject: " + reflectionSubject);
@@ -919,7 +923,10 @@
if (allowTextEntry.equalsIgnoreCase(ON))
allowTextBoolean=true;
- if (reflect.equalsIgnoreCase(ON))
+ //if (reflect.equalsIgnoreCase(ON))
+ // reflectBoolean=true;
+
+ if ((reflect != null) && (reflect.equalsIgnoreCase("1")))
reflectBoolean=true;
}
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAuthoringForm.java
===================================================================
diff -u -r5399ff761841ef5f7a767b9df7828fdb4f783aa6 -r24757442203ab054339af87ac1128fd737781c63
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAuthoringForm.java (.../VoteAuthoringForm.java) (revision 5399ff761841ef5f7a767b9df7828fdb4f783aa6)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAuthoringForm.java (.../VoteAuthoringForm.java) (revision 24757442203ab054339af87ac1128fd737781c63)
@@ -202,7 +202,8 @@
this.voteChangable =OPTION_OFF;
this.lockOnFinish =OPTION_OFF;
this.allowText =OPTION_OFF;
- this.reflect =OPTION_OFF;
+ //this.reflect =OPTION_OFF;
+ this.reflect ="0";
}
Index: lams_tool_vote/web/authoring/AdvancedContent.jsp
===================================================================
diff -u -rfadef2b7b1f00478057ecade707ca37aa24ebe15 -r24757442203ab054339af87ac1128fd737781c63
--- lams_tool_vote/web/authoring/AdvancedContent.jsp (.../AdvancedContent.jsp) (revision fadef2b7b1f00478057ecade707ca37aa24ebe15)
+++ lams_tool_vote/web/authoring/AdvancedContent.jsp (.../AdvancedContent.jsp) (revision 24757442203ab054339af87ac1128fd737781c63)
@@ -93,13 +93,9 @@