Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/Attic/VoteUtils.java,v
diff -u -r1.19 -r1.20
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java 6 Sep 2006 13:14:10 -0000 1.19
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java 7 Sep 2006 11:48:16 -0000 1.20
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java,v
diff -u -r1.15 -r1.16
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java 6 Sep 2006 13:14:09 -0000 1.15
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java 7 Sep 2006 11:48:16 -0000 1.16
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/Attic/VoteAuthoringForm.java,v
diff -u -r1.14 -r1.15
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAuthoringForm.java 31 Aug 2006 11:00:01 -0000 1.14
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAuthoringForm.java 7 Sep 2006 11:48:16 -0000 1.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/AdvancedContent.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_vote/web/authoring/AdvancedContent.jsp 6 Sep 2006 13:14:10 -0000 1.12
+++ lams_tool_vote/web/authoring/AdvancedContent.jsp 7 Sep 2006 11:48:16 -0000 1.13
@@ -93,13 +93,9 @@