Author: fdesbois Date: 2012-03-29 17:13:38 +0200 (Thu, 29 Mar 2012) New Revision: 3220 Url: http://chorem.org/repositories/revision/pollen/3220 Log: - resolve issues with deleteChoice - resolve issues with deleteComment Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteComment.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-03-29 15:13:30 UTC (rev 3219) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-03-29 15:13:38 UTC (rev 3220) @@ -647,6 +647,8 @@ } ChoiceDAO dao = getDAO(Choice.class); + + poll.removeChoice(choice); delete(dao, choice); commitTransaction("Could not delete choice " + choice.getName()); Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteComment.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteComment.java 2012-03-29 15:13:30 UTC (rev 3219) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteComment.java 2012-03-29 15:13:38 UTC (rev 3220) @@ -64,7 +64,6 @@ service.deleteComment(commentId); - resetCommentName(); return SUCCESS; } } Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp 2012-03-29 15:13:30 UTC (rev 3219) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp 2012-03-29 15:13:38 UTC (rev 3220) @@ -28,7 +28,7 @@ <s:form method="POST" namespace="/poll" action="deleteChoice"> <s:hidden key="uriId" label=''/> - <s:hidden key="choiceId" label=''/> + <s:hidden key="choiceId" value="%{choice.topiaId}" label=''/> <s:text name="pollen.information.confirmDeletePollChoice"> <s:param> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-03-29 15:13:30 UTC (rev 3219) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-03-29 15:13:38 UTC (rev 3220) @@ -199,7 +199,7 @@ </s:else> <s:if test="pollChoiceRunning"> <s:if test="creatorUser"> - <s:a action="deleteChoice" namespace="/poll"> + <s:a action="deleteChoice" namespace="/poll" onclick="return openDeleteChoiceDialog('%{#choice.topiaId}');"> <s:param name="choiceId"><s:property value="id"/></s:param> <img src="<s:url value="/img/delete.png"/>" title="<s:text name="pollen.action.deleteChoice"/>" @@ -433,7 +433,7 @@ <!-- Ajout de choix --> <s:if test="pollChoiceRunning"> <div id="choiceFormDiv"> - <s:form id="choiceForm" method="POST" namespace="/poll" validate="true"> + <s:form id="choiceForm" method="POST" namespace="/poll"> <h4><s:text name="pollen.action.addChoice"/></h4> <s:if test="textType"> <s:textfield key="choice.name"