Author: tchemit Date: 2012-05-25 09:56:56 +0200 (Fri, 25 May 2012) New Revision: 3387 Url: http://chorem.org/repositories/revision/pollen/3387 Log: refs #561: Can not create a image poll (add choice in a vote page does not work also :( Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-05-24 18:13:06 UTC (rev 3386) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-05-25 07:56:56 UTC (rev 3387) @@ -783,10 +783,8 @@ throw new PollNotFoundException(); } - Choice choiceAdded = saveChoice(poll, choice); + saveChoice(poll, choice); - poll.addChoice(choiceAdded); - commitTransaction("Can't create new choice [" + poll.getChoiceType() + "] for poll '" + pollId + "'"); } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-05-24 18:13:06 UTC (rev 3386) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-05-25 07:56:56 UTC (rev 3387) @@ -411,8 +411,10 @@ poll = getPollService().getPollByPollId(pollId); } Preconditions.checkNotNull(poll, "Can't load poll with id = [" + pollId + "]"); - - log.debug("Poll TopiaId: " + poll.getTopiaId()); + + if (log.isDebugEnabled()) { + log.debug("Poll TopiaId: " + poll.getTopiaId()); + } } protected void loadPollComments() { Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-05-24 18:13:06 UTC (rev 3386) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-05-25 07:56:56 UTC (rev 3387) @@ -443,7 +443,7 @@ required="true"/> </s:elseif> <s:elseif test="imageType"> - <s:file key="choice.location" + <s:file key="imageChoice[0]" label="%{getText('pollen.common.choice')}" cssClass="nameField" required="true"/>