Author: tchemit Date: 2012-05-18 16:15:42 +0200 (Fri, 18 May 2012) New Revision: 3375 Url: http://chorem.org/repositories/revision/pollen/3375 Log: #537: The poll must not be updatable after closing it Removed: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/edit.jsp Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/LoadPoll.java trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/LoadPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/LoadPoll.java 2012-05-18 12:48:26 UTC (rev 3374) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/LoadPoll.java 2012-05-18 14:15:42 UTC (rev 3375) @@ -66,6 +66,9 @@ String pollUid = pollUri == null ? null : pollUri.getPollId(); poll = getPollService().getPollEditable(pollUid, userAccount, clone); + if (poll.isClosed()) { + addFlashWarning(_("pollen.warning.poll.is.closed.so.read.only")); + } List<Choice> pollChoices = poll.getChoice(); List<VotingList> pollVotingLists = poll.getVotingList(); @@ -84,7 +87,7 @@ setReminder(true); setReminderHourCountdown(reminder.getSensibility()); } - + PreventRule notification = poll.getPreventRuleByScope( PreventRuleService.SCOPE_VOTE); if (notification != null) { Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-05-18 12:48:26 UTC (rev 3374) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-05-18 14:15:42 UTC (rev 3375) @@ -291,5 +291,6 @@ pollen.title.selectPersonListToAddVotingList=Select a voter list to import in voting list pollen.title.selectPersonListToCreateVotingList=Select a favorite list to import in a new voting list pollen.title.usersList=Users administration +pollen.warning.poll.is.closed.so.read.only=Poll is closed, you can not modifiy it anymore. title=Create a poll vote.anonymous=Anonymous vote Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-05-18 12:48:26 UTC (rev 3374) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-05-18 14:15:42 UTC (rev 3375) @@ -287,5 +287,6 @@ pollen.title.selectPersonListToAddVotingList=Sélectionner une liste de votants à ajouter pollen.title.selectPersonListToCreateVotingList=Sélectionner une liste de votants pour créer un nouveau groupe pollen.title.usersList=Gestion des utilisateurs +pollen.warning.poll.is.closed.so.read.only=Le sondage est clos, vous ne pouvez plus le modifer title=Création d'un sondage vote.anonymous=Vote anonyme Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-05-18 12:48:26 UTC (rev 3374) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-05-18 14:15:42 UTC (rev 3375) @@ -25,7 +25,8 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> -<link rel="stylesheet" type="text/css" href="<s:url value='/css/pollCreation.css'/>"/> +<link rel="stylesheet" type="text/css" + href="<s:url value='/css/pollCreation.css'/>"/> <link rel="stylesheet" type="text/css" href="<s:url value='/css/tipTip.css'/>"/> <script type="text/javascript"> @@ -56,17 +57,19 @@ choiceType:'<s:property value="%{poll.choiceType.name()}"/>', pollType:'<s:property value="%{poll.pollType.name()}"/>', - confirmCloseTitle: "<s:text name='pollen.title.close.poll'/>", - confirmCloseUrl: '<s:url action="confirmClosePoll/" namespace="/poll"/>' - + '<s:property value="%{poll.adminId}"/>', - confirmCloseRedirectUrl: '<s:url action="resultLink/" namespace="/poll"/>' - + '<s:property value="%{poll.adminId}"/>' + confirmCloseTitle:"<s:text name='pollen.title.close.poll'/>", + confirmCloseUrl:'<s:url action="confirmClosePoll/" namespace="/poll"/>' + + '<s:property value="%{poll.adminId}"/>', + confirmCloseRedirectUrl:'<s:url action="resultLink/" namespace="/poll"/>' + + '<s:property value="%{poll.adminId}"/>' } ); </script> -<script type="text/javascript" src='<s:url value="/js/createPoll.js"/>'></script> -<script type="text/javascript" src='<s:url value="/js/jquery.tipTip.minified.js"/>'></script> +<script type="text/javascript" + src='<s:url value="/js/createPoll.js"/>'></script> +<script type="text/javascript" + src='<s:url value="/js/jquery.tipTip.minified.js"/>'></script> <s:url id='errorImg' value='/img/exclamation.png'/> @@ -225,8 +228,10 @@ </div> <div id="pollTypeRESTRICTED" class="pollType"> - <s:iterator value="restrictedVotingList" status="status" var="votingList"> - <s:set name="votingListNumber"><s:property value="%{#status.index}"/></s:set> + <s:iterator value="restrictedVotingList" status="status" + var="votingList"> + <s:set name="votingListNumber"><s:property + value="%{#status.index}"/></s:set> <s:set name="votingListType">RESTRICTED</s:set> <%@include file="displayVotingList.jsp" %> </s:iterator> @@ -234,8 +239,10 @@ <div id="pollTypeGROUP" class="pollType"> <div id="votingListGROUP"> - <s:iterator value="groupVotingList" status="status" var="votingList"> - <s:set name="votingListNumber"><s:property value="%{#status.index}"/></s:set> + <s:iterator value="groupVotingList" status="status" + var="votingList"> + <s:set name="votingListNumber"><s:property + value="%{#status.index}"/></s:set> <s:set name="votingListType">GROUP</s:set> <%@include file="displayVotingList.jsp" %> </s:iterator> @@ -286,6 +293,11 @@ addErrorImage($('#tabOptions a')); } + if (<s:property value="%{poll.closed}"/>) { + $('#registerForm input, textarea').attr('disabled', true); + $('#registerForm :button, fieldset a, :submit, input[type="file"]').hide(); + } + }); </script> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp 2012-05-18 12:48:26 UTC (rev 3374) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp 2012-05-18 14:15:42 UTC (rev 3375) @@ -191,12 +191,10 @@ alt="<s:text name='pollen.image.not.loaded'/>" title="<s:text name='pollen.image.not.loaded'/>" src="<s:property value='imageUrl'/>" width="100px" height="75px"> - <span style="float: left; margin-left:50px; "> <s:file key='imageChoice[%{#choiceNumber}]' label='' theme="simple" - cssClass="nameField" - disabled="%{voteStarted}" cssStyle="clear: both;"/> - </span> + cssClass="nameField fleft" + disabled="%{voteStarted}" cssStyle="margin-left:50px;"/> </s:else> Deleted: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/edit.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/edit.jsp 2012-05-18 12:48:26 UTC (rev 3374) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/edit.jsp 2012-05-18 14:15:42 UTC (rev 3375) @@ -1,25 +0,0 @@ -<%-- - #%L - Pollen :: UI (strust2) - - $Id$ - $HeadURL$ - %% - Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --%> -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<h2>edit poll TODO</h2> \ No newline at end of file