Index: lams_tool_vote/db/sql/create_lams_tool_vote.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/db/sql/create_lams_tool_vote.sql,v diff -u -r1.25.10.2 -r1.25.10.3 --- lams_tool_vote/db/sql/create_lams_tool_vote.sql 16 Mar 2010 19:59:21 -0000 1.25.10.2 +++ lams_tool_vote/db/sql/create_lams_tool_vote.sql 16 Mar 2010 21:18:16 -0000 1.25.10.3 @@ -6,7 +6,7 @@ , creation_date DATETIME , update_date DATETIME , maxNominationCount VARCHAR(20) NOT NULL DEFAULT '1' - , minNominationCount VARCHAR(20) DEFAULT '1' + , minNominationCount VARCHAR(20) NOT NULL DEFAULT '1' , allowText TINYINT(1) NOT NULL DEFAULT 0 , reflect TINYINT(1) NOT NULL DEFAULT 0 , created_by BIGINT(20) NOT NULL DEFAULT 0 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.29.10.1 -r1.29.10.2 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java 10 Mar 2010 15:02:09 -0000 1.29.10.1 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java 16 Mar 2010 21:18:16 -0000 1.29.10.2 @@ -243,7 +243,7 @@ String minNomcount= defaultVoteContent.getMinNominationCount(); logger.debug("minNomcount: " + minNomcount); - if (minNomcount.equals("")) + if ((minNomcount == null) || minNomcount.equals("")) minNomcount="0"; voteAuthoringForm.setMinNominationCount(minNomcount); voteGeneralAuthoringDTO.setMinNominationCount(minNomcount); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20100309_updateTo235.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20100309_updateTo235.sql,v diff -u -r1.1.2.2 -r1.1.2.3 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20100309_updateTo235.sql 16 Mar 2010 19:59:21 -0000 1.1.2.2 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20100309_updateTo235.sql 16 Mar 2010 21:18:17 -0000 1.1.2.3 @@ -1,7 +1,7 @@ SET AUTOCOMMIT = 0; -- LDEV-2525 Include a minimum number of votes option -alter table tl_lavote11_content add column minNominationCount VARCHAR(20) DEFAULT '1'; +alter table tl_lavote11_content add column minNominationCount VARCHAR(20) NOT NULL DEFAULT '1'; COMMIT; SET AUTOCOMMIT = 1; \ No newline at end of file Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteImportContentVersionFilter.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteImportContentVersionFilter.java,v diff -u -r1.3 -r1.3.10.1 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteImportContentVersionFilter.java 26 Mar 2008 03:57:40 -0000 1.3 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteImportContentVersionFilter.java 16 Mar 2010 21:18:16 -0000 1.3.10.1 @@ -44,4 +44,8 @@ this.addField(VoteContent.class, "showResults", true); } + /** Version 2.3.4 added a minNominationCount column and this should default to "1". */ + public void up20090726To20100309(){ + this.addField(VoteContent.class, "minNominationCount", "1"); + } }