This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git commit f8a65c710534c4f0906c4a6ba123104fadea3f87 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 8 09:10:29 2014 +0100 fixes #1138: Some errors happens after updating to struts2 version to 2.3.15.3 --- pollen-ui-struts2/src/main/resources/struts.xml | 3 +++ .../src/main/webapp/WEB-INF/jsp/poll/confirmClonePoll.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/poll/confirmDeletePoll.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp | 2 +- pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp | 6 +++--- .../src/main/webapp/WEB-INF/jsp/user/confirmDeleteFavoriteList.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/user/confirmDeletePollAccount.jsp | 2 +- pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp | 2 +- 11 files changed, 15 insertions(+), 12 deletions(-) diff --git a/pollen-ui-struts2/src/main/resources/struts.xml b/pollen-ui-struts2/src/main/resources/struts.xml index bac5113..f22ae89 100644 --- a/pollen-ui-struts2/src/main/resources/struts.xml +++ b/pollen-ui-struts2/src/main/resources/struts.xml @@ -47,6 +47,9 @@ <constant name="struts.enable.SlashesInActionNames" value="true"/> <constant name="struts.devMode" value="false"/> + <!-- See voir http://struts.apache.org/release/2.3.x/docs/s2-019.html --> + <constant name="struts.enable.DynamicMethodInvocation" value="true"/> + <bean class="org.chorem.pollen.services.PollenServiceFactory"/> <!--Performance tuning--> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClonePoll.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClonePoll.jsp index 1baf0ca..3490dd8 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClonePoll.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClonePoll.jsp @@ -26,7 +26,7 @@ return false; } </script> -<s:form method="POST" namespace="/poll"> +<s:form method="POST" namespace="/poll" action="clone/%{pollUri}"> <fieldset class="ui-widget-content ui-corner-all"> <s:hidden key="redirectUrl" label=''/> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp index 76eb0b2..d07c6ad 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp @@ -26,7 +26,7 @@ return false; } </script> -<s:form method="POST" namespace="/poll"> +<s:form method="POST" namespace="/poll" action="close/%{pollUri}"> <fieldset class="ui-widget-content ui-corner-all"> <s:hidden key="redirectUrl" label=''/> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePoll.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePoll.jsp index 334fb8c..cca19d6 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePoll.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePoll.jsp @@ -26,7 +26,7 @@ return false; } </script> -<s:form method="POST" namespace="/poll"> +<s:form method="POST" namespace="/poll" action="delete/%{pollUri}"> <fieldset class="ui-widget-content ui-corner-all"> <s:hidden key="redirectUrl" label=''/> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp index e26913b..9c0688f 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp @@ -24,7 +24,7 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <br/> -<s:form method="POST" namespace="/poll"> +<s:form method="POST" namespace="/poll" action="deleteChoice/%{pollUri}"> <s:hidden key="choiceId" value="%{choice.topiaId}" label=''/> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp index 5b24fa4..cad454f 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp @@ -23,7 +23,7 @@ <%@ page contentType="text/html;charset=UTF-8" language="java" %> <%@ taglib prefix="s" uri="/struts-tags" %> <br/> -<s:form method="POST" namespace="/poll"> +<s:form method="POST" namespace="/poll" action="deleteComment/%{pollUri}"> <s:hidden name="commentId" value='%{comment.topiaId}'/> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp index 40207db..8a1e6db 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp @@ -23,7 +23,7 @@ <%@ page contentType="text/html;charset=UTF-8" language="java" %> <%@ taglib prefix="s" uri="/struts-tags" %> <br/> -<s:form method="POST" namespace="/poll"> +<s:form method="POST" namespace="/poll" action="deleteVote/%{pollUri}"> <s:hidden key="voteId" value="%{vote.topiaId}" label=''/> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp index 20d6f0c..cff527e 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp @@ -140,7 +140,7 @@ <%--t:currentPage="page" t:noPagerText="prop:noPagerText"/>--%> </s:else> -<s:form id="voteForm" validate="true"> +<s:form id="voteForm" validate="true" action="vote/%{pollUri}"> <s:hidden key="pollUri" label=''/> <%--<s:if test="poll.anonymous">--%> <%--<s:hidden key="vote.anonymous" label="" value='true'/>--%> @@ -352,7 +352,7 @@ <s:if test="pollChoiceRunning"> <div id="choiceFormDiv" class="clearfix"> <s:form id="choiceForm" method="POST" namespace="/poll" - enctype="multipart/form-data"> + enctype="multipart/form-data" action="addChoice/%{pollUri}"> <h4><s:text name="pollen.action.addChoice"/></h4> <s:if test="textType"> <s:textfield key="choice.name" requiredLabel="true" @@ -394,7 +394,7 @@ <div id="commentFormDiv"> <s:form id='addCommentForm' method="POST" namespace="/poll" - validate="true"> + validate="true" action="addComment/%{pollUri}"> <s:textfield key="commentAuthor" requiredLabel="true" size="78" label="%{getText('pollen.common.commentAuthor')}"/> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeleteFavoriteList.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeleteFavoriteList.jsp index 194f140..822c34f 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeleteFavoriteList.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeleteFavoriteList.jsp @@ -26,7 +26,7 @@ return false; } </script> -<s:form method="POST" namespace="/user"> +<s:form method="POST" namespace="/user" action="deleteFavoriteList"> <fieldset class="ui-widget-content ui-corner-all"> <s:hidden key="redirectUrl" label=''/> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeletePollAccount.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeletePollAccount.jsp index 1e4b6f8..d47ec92 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeletePollAccount.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeletePollAccount.jsp @@ -26,7 +26,7 @@ return false; } </script> -<s:form method="POST" namespace="/user"> +<s:form method="POST" namespace="/user" action="deletePollAccount"> <fieldset class="ui-widget-content ui-corner-all"> <s:hidden key="redirectUrl" label=''/> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp index 0045254..e19cb90 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp @@ -89,7 +89,7 @@ alt="<s:text name='poll.help.attachPoll'/>"/> </legend> - <s:form namespace="/user" method="POST"> + <s:form namespace="/user" method="POST" action="attachPoll"> <s:textfield key="pollId" label='%{getText("pollen.common.pollId")}' requiredLabel="true" size="80" tooltipIconPath="/img/tooltip.png" -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.