branch develop updated (109556a -> 69ac33d)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git from 109556a [jgitflow-maven-plugin]Updating develop poms back to pre merge state new e7e7dde fixes #1141: Fix some french i18n sentences (do not use edit in french but modifier) new bd0368e fixes #1143: Be able to configure authenticated email sending new 69ac33d fixes #1142: Do not use anymore the dynamic methods (improve security) The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 69ac33dd3b2361fea36ca4d217a393e6ae573caf Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 8 14:02:50 2014 +0100 fixes #1142: Do not use anymore the dynamic methods (improve security) commit bd0368e81af4a39351de5dbf3d5837a0dd6adf02 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 8 14:02:16 2014 +0100 fixes #1143: Be able to configure authenticated email sending commit e7e7dded0c156b544ca7570598d95d96ba6ab194 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 8 13:45:50 2014 +0100 fixes #1141: Fix some french i18n sentences (do not use edit in french but modifier) Summary of changes: .../org/chorem/pollen/PollenConfiguration.java | 24 +++++++++++ .../chorem/pollen/PollenConfigurationOption.java | 12 ++++++ .../i18n/pollen-persistence_en_GB.properties | 4 ++ .../i18n/pollen-persistence_fr_FR.properties | 4 ++ .../chorem/pollen/services/impl/EmailService.java | 9 +++- .../src/main/resources/config/struts-admin.xml | 4 +- .../src/main/resources/config/struts-io.xml | 4 +- .../src/main/resources/config/struts-poll.xml | 36 ++++++++-------- .../src/main/resources/config/struts-user.xml | 49 ++++++++++++++-------- .../i18n/pollen-ui-struts2_en_GB.properties | 1 + .../i18n/pollen-ui-struts2_fr_FR.properties | 11 ++--- pollen-ui-struts2/src/main/resources/struts.xml | 3 +- .../webapp/WEB-INF/decorators/layout-default.jsp | 8 ++-- .../webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp | 7 ++-- .../main/webapp/WEB-INF/jsp/admin/usersList.jsp | 10 ++--- .../webapp/WEB-INF/jsp/poll/confirmClonePoll.jsp | 6 +-- .../webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp | 6 +-- .../webapp/WEB-INF/jsp/poll/confirmDeletePoll.jsp | 6 +-- .../WEB-INF/jsp/poll/confirmDeletePollChoice.jsp | 6 +-- .../WEB-INF/jsp/poll/confirmDeletePollComment.jsp | 6 +-- .../WEB-INF/jsp/poll/confirmDeletePollVote.jsp | 6 +-- .../src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/poll/vote.jsp | 9 ++-- .../WEB-INF/jsp/user/confirmDeleteFavoriteList.jsp | 6 +-- .../WEB-INF/jsp/user/confirmDeletePollAccount.jsp | 6 +-- .../main/webapp/WEB-INF/jsp/user/createdList.jsp | 2 +- .../webapp/WEB-INF/jsp/user/dialogLostPassword.jsp | 5 +-- .../src/main/webapp/WEB-INF/jsp/user/edit.jsp | 4 +- .../main/webapp/WEB-INF/jsp/user/favoriteList.jsp | 15 +++---- .../main/webapp/WEB-INF/jsp/user/favoriteLists.jsp | 7 ++-- .../src/main/webapp/WEB-INF/jsp/user/login.jsp | 5 +-- .../src/main/webapp/WEB-INF/jsp/user/register.jsp | 3 +- .../src/main/webapp/WEB-INF/jsp/user/show.jsp | 5 +-- src/site/fr/rst/configure.rst | 6 ++- src/site/rst/configure.rst | 6 ++- 35 files changed, 172 insertions(+), 131 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 e7e7dded0c156b544ca7570598d95d96ba6ab194 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 8 13:45:50 2014 +0100 fixes #1141: Fix some french i18n sentences (do not use edit in french but modifier) --- .../main/resources/i18n/pollen-ui-struts2_en_GB.properties | 1 + .../main/resources/i18n/pollen-ui-struts2_fr_FR.properties | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties b/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties index 8381488..d8ad540 100644 --- a/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties +++ b/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties @@ -27,6 +27,7 @@ pollen.action.deletePoll.help=Delete this poll pollen.action.deletePollAccount=Delete selected member pollen.action.deleteUser=Delete selected user pollen.action.deleteVote=Delete this vote +pollen.action.edit=Edit pollen.action.editFavoriteList=Edit a list pollen.action.editPoll=Edit the poll pollen.action.editPoll.help=Edit this poll diff --git a/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties b/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties index 0452761..9a96c2c 100644 --- a/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties +++ b/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties @@ -27,11 +27,12 @@ pollen.action.deletePoll.help=Supprimer ce sondage pollen.action.deletePollAccount=Supprimer une membre de la liste pollen.action.deleteUser=Supprimer un utilisateur sélectionné pollen.action.deleteVote=Supprimer ce vote -pollen.action.editFavoriteList=Editer une liste sélectionnée +pollen.action.edit=Modifier +pollen.action.editFavoriteList=Modifier une liste sélectionnée pollen.action.editPoll=Modifier le sondage -pollen.action.editPoll.help=Éditer ce sondage -pollen.action.editPollAccount=Editer le membre sélectionné -pollen.action.editUser=Editer un utilisateur sélectionné +pollen.action.editPoll.help=Modifier ce sondage +pollen.action.editPollAccount=Modifier le membre sélectionné +pollen.action.editUser=Modifier un utilisateur sélectionné pollen.action.editVote=Modifier le vote pollen.action.exportPoll.help=Exporter ce sondage au format xml pollen.action.importPersonListToExistingVotingList=Ajouter la liste sélectionnée de votants @@ -47,7 +48,7 @@ pollen.action.pollClone=Créer un nouveau sondage à partir de celui-ci pollen.action.pollClose=Fermer le sondage pollen.action.pollCommentDelete=Supprimer le commentaire pollen.action.pollDelete=Supprimer le sondage -pollen.action.pollEdit=Editer le sondage +pollen.action.pollEdit=Modifier le sondage pollen.action.pollExport=Exporter le sondage pollen.action.pollModerateVote=Administrer les votes pollen.action.pollModerateVote.help=Modérer les votes et commentaires du sondage -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 bd0368e81af4a39351de5dbf3d5837a0dd6adf02 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 8 14:02:16 2014 +0100 fixes #1143: Be able to configure authenticated email sending --- .../org/chorem/pollen/PollenConfiguration.java | 24 ++++++++++++++++++++++ .../chorem/pollen/PollenConfigurationOption.java | 12 +++++++++++ .../i18n/pollen-persistence_en_GB.properties | 4 ++++ .../i18n/pollen-persistence_fr_FR.properties | 4 ++++ .../chorem/pollen/services/impl/EmailService.java | 9 ++++++-- src/site/fr/rst/configure.rst | 6 +++++- src/site/rst/configure.rst | 6 +++++- 7 files changed, 61 insertions(+), 4 deletions(-) diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java b/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java index 6d28e79..8bde13d 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java @@ -177,6 +177,30 @@ public class PollenConfiguration { return result; } + public boolean isEmailAuth() { + boolean result = applicationConfig.getOptionAsBoolean( + PollenConfigurationOption.EMAIL_AUTH.key); + return result; + } + + public boolean isEmailAuthSsl() { + boolean result = applicationConfig.getOptionAsBoolean( + PollenConfigurationOption.EMAIL_SSL.key); + return result; + } + + public String getEmailAuthLogin() { + String result = applicationConfig.getOption( + PollenConfigurationOption.EMAIL_AUTH_LOGIN.key); + return result; + } + + public String getEmailAuthPassword() { + String result = applicationConfig.getOption( + PollenConfigurationOption.EMAIL_AUTH_PASSWORD.key); + return result; + } + public String getEmailFrom() { String result = applicationConfig.getOption( PollenConfigurationOption.EMAIL_FROM.key); diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java b/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java index 35d7ab8..b113174 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java @@ -66,6 +66,18 @@ public enum PollenConfigurationOption implements ApplicationConfig.OptionDef { /** port for email sending configuration. */ EMAIL_PORT("email_port", n_("pollen.configuration.emailPort"), "25", String.class), + /** flag to use ssl for email sending configuration. */ + EMAIL_SSL("email_ssl", n_("pollen.configuration.emailSsl"), "false", boolean.class), + + /** flag to use auth for email sending configuration. */ + EMAIL_AUTH("email_auth", n_("pollen.configuration.emailAuth"), "false", boolean.class), + + /** login to use if auth at email sending. */ + EMAIL_AUTH_LOGIN("email_auth_login", n_("pollen.configuration.emailAuthLogin"), "", String.class), + + /** password to use if auth at email sending. */ + EMAIL_AUTH_PASSWORD("email_auth_password", n_("pollen.configuration.emailAuthPassword"), "", String.class), + /** from for email sending configuration. */ EMAIL_FROM("email_from", n_("pollen.configuration.emailFrom"), "bot@pollen.org", String.class), diff --git a/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties b/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties index 1b59f84..17f0a9e 100644 --- a/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties +++ b/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties @@ -20,9 +20,13 @@ pollen.configuration.defaultPollType=Default poll type to use at a new poll crea pollen.configuration.defaultPollVoteVisibility=Default vote visibility to use at a new poll creation pollen.configuration.defaultVoteCountingType=Default vote counting type to use at a new poll creation pollen.configuration.emaiDirectory=directory to store emails before sending them +pollen.configuration.emailAuth=Flag to use authenticated user to send emails +pollen.configuration.emailAuthLogin=Login to use to send email if auth is required +pollen.configuration.emailAuthPassword=Password to use to send email if auth is required pollen.configuration.emailFrom=from for email sending configuration pollen.configuration.emailHost=host for email sending configuration pollen.configuration.emailPort=port for email sending configuration +pollen.configuration.emailSsl=flag to use ssl to send emails pollen.configuration.feedDirectory=path for feed directory pollen.configuration.imageDirectory=path for uploaded images directory pollen.configuration.nbVoteByPage=nb votes to display per page diff --git a/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties b/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties index 4380536..c3eec76 100644 --- a/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties +++ b/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties @@ -20,9 +20,13 @@ pollen.configuration.defaultPollType=Type de sondage par défaut à utiliser lor pollen.configuration.defaultPollVoteVisibility=Visibilité des votes par défaut à utiliser lors de la création d'un sondage pollen.configuration.defaultVoteCountingType=Type de dépouillement par défaut à utiliser lors de la création d'un sondage pollen.configuration.emaiDirectory=Répertoire des emails +pollen.configuration.emailAuth=Drapeau pour utiliser un login/password lors de l'envoie des courriels +pollen.configuration.emailAuthLogin=Login de l'utilisateur pour l'authentification lors de l'envoie des courriels +pollen.configuration.emailAuthPassword=Mot de passe de l'utilisateur pour l'authentification lors de l'envoie des courriels pollen.configuration.emailFrom=Email de l'envoyeur dans les emails pollen.configuration.emailHost=Serveur d'envoie d'email pollen.configuration.emailPort=Port du serveur d'envoi d'email +pollen.configuration.emailSsl=Drapeau pour utiliser le transport sll lors de l'envoie des courriels pollen.configuration.feedDirectory=Répertoire des flux rss pollen.configuration.imageDirectory=répertoire où sont enregistrés les images pollen.configuration.nbVoteByPage=Nombre de votes à afficher par page diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java b/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java index 038e4fd..5580935 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java @@ -39,7 +39,6 @@ import org.chorem.pollen.business.persistence.UserAccount; import org.chorem.pollen.services.PollenServiceSupport; import org.nuiton.util.StringUtil; -import java.util.Comparator; import java.util.List; import java.util.Locale; @@ -296,8 +295,14 @@ public class EmailService extends PollenServiceSupport { email.setHostName(configuration.getEmailHost()); email.setSmtpPort(configuration.getEmailPort()); + email.setSSLOnConnect(configuration.isEmailAuthSsl()); email.setFrom(configuration.getEmailFrom()); email.setCharset(configuration.getCharset()); + if (configuration.isEmailAuth()) { + String authUsername = configuration.getEmailAuthLogin(); + String authPassword = configuration.getEmailAuthPassword(); + email.setAuthentication(authUsername, authPassword); + } email.addTo(to); email.setSubject(subject); @@ -326,7 +331,7 @@ public class EmailService extends PollenServiceSupport { return new PollenEmail(to, subject, content); } - public static class PollenEmail implements Comparable<PollenEmail>{ + public static class PollenEmail implements Comparable<PollenEmail> { protected String subject; diff --git a/src/site/fr/rst/configure.rst b/src/site/fr/rst/configure.rst index 8f1f1be..952d547 100644 --- a/src/site/fr/rst/configure.rst +++ b/src/site/fr/rst/configure.rst @@ -65,6 +65,10 @@ configuration: email_host= Serveur smtp pour envoyer les emails email_port= Port du serveur smtp email_from= Adresse de l'envoyeur de mail + email_ssl=false|true (pour utiliser le transport ssl) + email_auth=false|true (pour utiliser un login/password d'authentification) + email_auth_login=Login de l'utilisateur pour l'authentification (utilisé uniquement si email_auth=true) + email_auth_password=Mot de passe de l'utilisateur pour l'authentification (utilisé uniquement si email_auth=true) Configurer la base de données ----------------------------- @@ -101,4 +105,4 @@ Voici un tableau des propriétés pour les bases usuelles: | MySql | org.hibernate.dialect.MySQLDialect | com.mysql.jdbc.Driver | jdbc:mysql:pollen | +-------------------------+------------------------------------------+-----------------------------------+------------------------------------------+ -.. _page des options: ./config-report.html +.. _page des options: ./application-config-report.html diff --git a/src/site/rst/configure.rst b/src/site/rst/configure.rst index e9b1357..0b4b113 100644 --- a/src/site/rst/configure.rst +++ b/src/site/rst/configure.rst @@ -62,6 +62,10 @@ So that Pollen can send emails you must fill in the following configuration: email_host= Smtp server address (ex: localhost, smtp.free.fr, ...) email_port= Smtp server port (by default: 25) email_from= Mail sender address (ex: mypolleninstance@me.com) + email_ssl=false|true (to use ssl transport layer) + email_auth=false|true (to use a login/password authentication) + email_auth_login=Login for authentication (only used if email_auth=true) + email_auth_password=Password for authentication (only used if email_auth=true) Configure database ------------------ @@ -96,4 +100,4 @@ Here are the properties for usual databases: | MySql | org.hibernate.dialect.MySQLDialect | com.mysql.jdbc.Driver | jdbc:mysql:pollen | +-------------------------+------------------------------------------+-----------------------------------+------------------------------------------+ -.. _options page: ./config-report.html +.. _options page: ./application-config-report.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 69ac33dd3b2361fea36ca4d217a393e6ae573caf Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 8 14:02:50 2014 +0100 fixes #1142: Do not use anymore the dynamic methods (improve security) --- .../src/main/resources/config/struts-admin.xml | 4 +- .../src/main/resources/config/struts-io.xml | 4 +- .../src/main/resources/config/struts-poll.xml | 36 ++++++++-------- .../src/main/resources/config/struts-user.xml | 49 ++++++++++++++-------- pollen-ui-struts2/src/main/resources/struts.xml | 3 +- .../webapp/WEB-INF/decorators/layout-default.jsp | 8 ++-- .../webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp | 7 ++-- .../main/webapp/WEB-INF/jsp/admin/usersList.jsp | 10 ++--- .../webapp/WEB-INF/jsp/poll/confirmClonePoll.jsp | 6 +-- .../webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp | 6 +-- .../webapp/WEB-INF/jsp/poll/confirmDeletePoll.jsp | 6 +-- .../WEB-INF/jsp/poll/confirmDeletePollChoice.jsp | 6 +-- .../WEB-INF/jsp/poll/confirmDeletePollComment.jsp | 6 +-- .../WEB-INF/jsp/poll/confirmDeletePollVote.jsp | 6 +-- .../src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/poll/vote.jsp | 9 ++-- .../WEB-INF/jsp/user/confirmDeleteFavoriteList.jsp | 6 +-- .../WEB-INF/jsp/user/confirmDeletePollAccount.jsp | 6 +-- .../main/webapp/WEB-INF/jsp/user/createdList.jsp | 2 +- .../webapp/WEB-INF/jsp/user/dialogLostPassword.jsp | 5 +-- .../src/main/webapp/WEB-INF/jsp/user/edit.jsp | 4 +- .../main/webapp/WEB-INF/jsp/user/favoriteList.jsp | 15 +++---- .../main/webapp/WEB-INF/jsp/user/favoriteLists.jsp | 7 ++-- .../src/main/webapp/WEB-INF/jsp/user/login.jsp | 5 +-- .../src/main/webapp/WEB-INF/jsp/user/register.jsp | 3 +- .../src/main/webapp/WEB-INF/jsp/user/show.jsp | 5 +-- 26 files changed, 104 insertions(+), 122 deletions(-) diff --git a/pollen-ui-struts2/src/main/resources/config/struts-admin.xml b/pollen-ui-struts2/src/main/resources/config/struts-admin.xml index 537f458..9fc0043 100644 --- a/pollen-ui-struts2/src/main/resources/config/struts-admin.xml +++ b/pollen-ui-struts2/src/main/resources/config/struts-admin.xml @@ -60,13 +60,13 @@ </action> <!-- confirm delete user --> - <action name="confirmDeleteUser" + <action name="confirmDeleteUser" method="execute" class="org.chorem.pollen.ui.actions.admin.Confirm"> <result>/WEB-INF/jsp/admin/confirmDeleteUser.jsp</result> </action> <!-- delete user --> - <action name="deleteUser" + <action name="deleteUser" method="execute" class="org.chorem.pollen.ui.actions.admin.DeleteUser"> <result type="redirect2"/> </action> diff --git a/pollen-ui-struts2/src/main/resources/config/struts-io.xml b/pollen-ui-struts2/src/main/resources/config/struts-io.xml index c1a7809..3390b57 100644 --- a/pollen-ui-struts2/src/main/resources/config/struts-io.xml +++ b/pollen-ui-struts2/src/main/resources/config/struts-io.xml @@ -35,7 +35,7 @@ </result-types> <!-- generate a chart as an image --> - <action name="generateChart" + <action name="generateChart" method="execute" class="org.chorem.pollen.ui.actions.io.GenerateChart"> <result type="chart"> <param name="width">${width}</param> @@ -44,7 +44,7 @@ </action> <!-- generate a chart as an image --> - <action name="getPollChoiceImage" + <action name="getPollChoiceImage" method="execute" class="org.chorem.pollen.ui.actions.io.GetPollImageChoice"> <result type="stream"> <param name="contentType">${contentType}</param> diff --git a/pollen-ui-struts2/src/main/resources/config/struts-poll.xml b/pollen-ui-struts2/src/main/resources/config/struts-poll.xml index 1542318..d80b12f 100644 --- a/pollen-ui-struts2/src/main/resources/config/struts-poll.xml +++ b/pollen-ui-struts2/src/main/resources/config/struts-poll.xml @@ -76,7 +76,7 @@ </action> <!-- export poll --> - <action name="export/*" + <action name="export/*" method="execute" class="org.chorem.pollen.ui.actions.poll.admin.ExportPoll"> <!--<param name="pollUri">{1}</param>--> <result type="stream"> @@ -91,7 +91,7 @@ </action> <!-- confirm close poll --> - <action name="confirmClosePoll/*" + <action name="confirmClosePoll/*" method="execute" class="org.chorem.pollen.ui.actions.poll.admin.ConfirmPollAction"> <result>/WEB-INF/jsp/poll/confirmClosePoll.jsp</result> </action> @@ -103,13 +103,13 @@ </action> <!-- confirm delete poll --> - <action name="confirmDeletePoll/*" + <action name="confirmDeletePoll/*" method="execute" class="org.chorem.pollen.ui.actions.poll.admin.ConfirmPollAction"> <result>/WEB-INF/jsp/poll/confirmDeletePoll.jsp</result> </action> <!-- delete poll --> - <action name="delete/*" + <action name="delete/*" method="execute" class="org.chorem.pollen.ui.actions.poll.admin.DeletePoll"> <!--<param name="pollUri">{1}</param>--> <result type="redirectToHome"/> @@ -161,19 +161,19 @@ </action> <!-- confirm delete poll vote --> - <action name="confirmDeleteVote/*" + <action name="confirmDeleteVote/*" method="execute" class="org.chorem.pollen.ui.actions.poll.vote.ConfirmDeleteVote"> <result>/WEB-INF/jsp/poll/confirmDeletePollVote.jsp</result> </action> <!-- delete poll vote --> - <action name="deleteVote/*" + <action name="deleteVote/*" method="execute" class="org.chorem.pollen.ui.actions.poll.vote.DeleteVote"> <result type="redirectToVote"/> </action> <!-- add a poll comment --> - <action name="addComment/*" + <action name="addComment/*" method="execute" class="org.chorem.pollen.ui.actions.poll.vote.AddComment"> <!--<param name="pollUri">{1}</param>--> <result name="input">/WEB-INF/jsp/poll/vote.jsp</result> @@ -181,19 +181,19 @@ </action> <!-- confirm delete comment --> - <action name="confirmDeleteComment/*" + <action name="confirmDeleteComment/*" method="execute" class="org.chorem.pollen.ui.actions.poll.vote.ConfirmDeleteComment"> <result>/WEB-INF/jsp/poll/confirmDeletePollComment.jsp</result> </action> <!-- delete a poll comment --> - <action name="deleteComment/*" + <action name="deleteComment/*" method="execute" class="org.chorem.pollen.ui.actions.poll.vote.DeleteComment"> <result type="redirectToVote"/> </action> <!-- add a choice --> - <action name="addChoice/*" + <action name="addChoice/*" method="execute" class="org.chorem.pollen.ui.actions.poll.vote.AddChoice"> <!--<param name="pollUri">{1}</param>--> <result name="input">/WEB-INF/jsp/poll/vote.jsp</result> @@ -201,19 +201,19 @@ </action> <!-- confirm delete poll choice --> - <action name="confirmDeleteChoice/*" + <action name="confirmDeleteChoice/*" method="execute" class="org.chorem.pollen.ui.actions.poll.vote.ConfirmDeleteChoice"> <result>/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp</result> </action> <!-- delete poll choice --> - <action name="deleteChoice/*" + <action name="deleteChoice/*" method="execute" class="org.chorem.pollen.ui.actions.poll.vote.DeleteChoice"> <result type="redirectToVote"/> </action> <!-- display * --> - <action name="display*" + <action name="display*" method="execute" class="org.chorem.pollen.ui.actions.poll.form.Display{1}"> <result>/WEB-INF/jsp/poll/display{1}.jsp</result> </action> @@ -226,7 +226,7 @@ </action> <!-- get the feed of a given poll --> - <action name="getFeed" + <action name="getFeed" method="execute" class="org.chorem.pollen.ui.actions.poll.GetPollFeed"> <result type="stream"> <param name="contentCharSet">UTF-8</param> @@ -237,26 +237,26 @@ </action> <!-- Select a favorite list to add to a voting list --> - <action name="selectPersonListToAddToVotingList" + <action name="selectPersonListToAddToVotingList" method="execute" class="org.chorem.pollen.ui.actions.poll.form.SelectPersonListToVotingList"> <result>/WEB-INF/jsp/poll/selectPersonListToAddToVotingList.jsp</result> </action> <!-- Select a favorite list to import into a new voting list --> - <action name="selectPersonListToCreateNewVotingList" + <action name="selectPersonListToCreateNewVotingList" method="execute" class="org.chorem.pollen.ui.actions.poll.form.SelectPersonListToVotingList"> <result>/WEB-INF/jsp/poll/selectPersonListToCreateNewVotingList.jsp </result> </action> <!-- Load in session a personList to be imported into a voting list --> - <action name="importPersonListToVotingList" + <action name="importPersonListToVotingList" method="execute" class="org.chorem.pollen.ui.actions.poll.form.ImportPersonListToVotingList"> <result>/WEB-INF/jsp/poll/displayVotingListPersons.jsp</result> </action> <!-- Load in session a personList to be imported into a new voting list --> - <action name="importPersonListToNewVotingList" + <action name="importPersonListToNewVotingList" method="execute" class="org.chorem.pollen.ui.actions.poll.form.ImportPersonListToVotingList"> <result>/WEB-INF/jsp/poll/displayVotingList.jsp</result> </action> diff --git a/pollen-ui-struts2/src/main/resources/config/struts-user.xml b/pollen-ui-struts2/src/main/resources/config/struts-user.xml index d32089f..26fce4a 100644 --- a/pollen-ui-struts2/src/main/resources/config/struts-user.xml +++ b/pollen-ui-struts2/src/main/resources/config/struts-user.xml @@ -49,19 +49,29 @@ <result type="redirect2"/> </action> + <!-- register user (input) --> + <action name="registerInput" class="org.chorem.pollen.ui.actions.user.Register" method="input"> + <result name="input">/WEB-INF/jsp/user/register.jsp</result> + </action> + <!-- register user --> - <action name="register" class="org.chorem.pollen.ui.actions.user.Register"> + <action name="register" class="org.chorem.pollen.ui.actions.user.Register" method="execute"> <result name="input">/WEB-INF/jsp/user/register.jsp</result> <result type="redirectToHome"/> </action> <!-- show user account --> - <action name="show" class="org.chorem.pollen.ui.actions.PollenActionSupportForEdition"> + <action name="show" class="org.chorem.pollen.ui.actions.PollenActionSupportForEdition" method="execute"> <result>/WEB-INF/jsp/user/show.jsp</result> </action> + <!-- edit user account (input) --> + <action name="editInput" class="org.chorem.pollen.ui.actions.user.Edit" method="input"> + <result name="input">/WEB-INF/jsp/user/edit.jsp</result> + </action> + <!-- edit user account --> - <action name="edit" class="org.chorem.pollen.ui.actions.user.Edit"> + <action name="edit" class="org.chorem.pollen.ui.actions.user.Edit" method="execute"> <result name="input">/WEB-INF/jsp/user/edit.jsp</result> <result type="redirectAction"> <param name="actionName">show</param> @@ -69,14 +79,19 @@ </result> </action> + <!-- lost password (input) --> + <action name="lostPasswordInput" class="org.chorem.pollen.ui.actions.user.LostPassword" method="input"> + <result name="input">/WEB-INF/jsp/user/dialogLostPassword.jsp</result> + </action> + <!-- lost password --> - <action name="lostPassword" class="org.chorem.pollen.ui.actions.user.LostPassword"> + <action name="lostPassword" class="org.chorem.pollen.ui.actions.user.LostPassword" method="execute"> <result name="input">/WEB-INF/jsp/user/dialogLostPassword.jsp</result> <result type="redirectToHome"/> </action> <!-- logout --> - <action name="logout" class="org.chorem.pollen.ui.actions.user.Logout"> + <action name="logout" class="org.chorem.pollen.ui.actions.user.Logout" method="execute"> <result type="redirectToHome"/> </action> @@ -89,7 +104,7 @@ </action> <!-- create favorite list --> - <action name="createFavoriteList" + <action name="createFavoriteList" method="execute" class="org.chorem.pollen.ui.actions.user.CreateFavoriteList"> <interceptor-ref name="pollenParamsPrepareParamsStack"/> <result name="input">/WEB-INF/jsp/user/favoriteLists.jsp</result> @@ -97,27 +112,27 @@ </action> <!-- confirm delete favorite list --> - <action name="confirmDeleteFavoriteList" + <action name="confirmDeleteFavoriteList" method="execute" class="org.chorem.pollen.ui.actions.user.Confirm"> <result>/WEB-INF/jsp/user/confirmDeleteFavoriteList.jsp</result> </action> <!-- delete favorite list --> - <action name="deleteFavoriteList" + <action name="deleteFavoriteList" method="execute" class="org.chorem.pollen.ui.actions.user.DeleteFavoriteList"> <interceptor-ref name="pollenParamsPrepareParamsStack"/> <result type="redirect2"/> </action> <!-- edit favorite list --> - <action name="editFavoriteList" + <action name="editFavoriteList" method="execute" class="org.chorem.pollen.ui.actions.user.EditFavoriteList"> <interceptor-ref name="pollenParamsPrepareParamsStack"/> <result>/WEB-INF/jsp/user/favoriteList.jsp</result> </action> <!-- add poll account to favorite list --> - <action name="addPollAccount" + <action name="addPollAccount" method="execute" class="org.chorem.pollen.ui.actions.user.CreateFavoriteListVoter"> <interceptor-ref name="pollenParamsPrepareParamsStack"/> <result name="input">/WEB-INF/jsp/user/favoriteList.jsp</result> @@ -125,7 +140,7 @@ </action> <!-- edit poll account to favorite list --> - <action name="editPollAccount" + <action name="editPollAccount" method="execute" class="org.chorem.pollen.ui.actions.user.EditFavoriteListVoter"> <interceptor-ref name="pollenParamsPrepareParamsStack"/> <result name="input">/WEB-INF/jsp/user/favoriteList.jsp</result> @@ -133,20 +148,20 @@ </action> <!-- confirm delete poll account from a favorite list --> - <action name="confirmDeletePollAccount" + <action name="confirmDeletePollAccount" method="execute" class="org.chorem.pollen.ui.actions.user.Confirm"> <result>/WEB-INF/jsp/user/confirmDeletePollAccount.jsp</result> </action> <!-- remove poll account from a favorite list --> - <action name="deletePollAccount" + <action name="deletePollAccount" method="execute" class="org.chorem.pollen.ui.actions.user.DeleteFavoriteListVoter"> <interceptor-ref name="pollenParamsPrepareParamsStack"/> <result type="redirect2"/> </action> <!-- attach poll to the connected user account --> - <action name="attachPoll" + <action name="attachPoll" method="execute" class="org.chorem.pollen.ui.actions.user.AttachPoll"> <result name="input">/WEB-INF/jsp/user/createdList.jsp</result> <result type="redirectAction"> @@ -156,21 +171,21 @@ </action> <!-- display createds polls --> - <action name="createdList" + <action name="createdList" method="execute" class="org.chorem.pollen.ui.actions.PollenActionSupportForEdition"> <interceptor-ref name="pollenBasicStack"/> <result>/WEB-INF/jsp/user/createdList.jsp</result> </action> <!-- display invited polls --> - <action name="invitedList" + <action name="invitedList" method="execute" class="org.chorem.pollen.ui.actions.PollenActionSupportForVote"> <interceptor-ref name="pollenBasicStack"/> <result>/WEB-INF/jsp/user/invitedList.jsp</result> </action> <!-- display participated polls --> - <action name="participatedList" + <action name="participatedList" method="execute" class="org.chorem.pollen.ui.actions.PollenActionSupportForVote"> <interceptor-ref name="pollenBasicStack"/> <result>/WEB-INF/jsp/user/participatedList.jsp</result> diff --git a/pollen-ui-struts2/src/main/resources/struts.xml b/pollen-ui-struts2/src/main/resources/struts.xml index f22ae89..e030b52 100644 --- a/pollen-ui-struts2/src/main/resources/struts.xml +++ b/pollen-ui-struts2/src/main/resources/struts.xml @@ -48,8 +48,7 @@ <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"/> - + <!--<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/decorators/layout-default.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp index 81184fd..f487fa8 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp @@ -60,7 +60,7 @@ $('.ui-dialog-title').html('<s:text name="pollen.link.lostPassword"/>'); - var url = '<s:url action="lostPassword" method="input" namespace="/user"/>'; + var url = '<s:url action="lostPasswordInput" namespace="/user"/>'; var dialog = $("#lostPasswordDialog"); dialog.load(url); dialog.dialog('open'); @@ -183,15 +183,13 @@ </a> </li> <li> - <s:submit id="submitform" action="KAction/login" align="right" - key="pollen.action.login" cssClass="KAction"/> + <s:submit id="submitform" align="right" key="pollen.action.login"/> </li> </ul> </s:form> </div> <s:text name="pollen.common.or"/> - <s:a action="KLink/register" method="input" namespace="/user" - cssClass="KLink" id='registerLink'> + <s:a action="KLink/registerInput" namespace="/user" cssClass="KLink" id='registerLink'> <s:text name="pollen.menu.register"/> </s:a> </s:else> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp index 413746f..350e543 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp @@ -26,7 +26,7 @@ return false; } </script> -<s:form method="POST" namespace="/admin"> +<s:form method="POST" namespace="/admin" action="deleteUser"> <fieldset class="ui-widget-content ui-corner-all"> <s:hidden key="redirectUrl" label=''/> @@ -45,9 +45,8 @@ </div> <hr/> <div align="right"> - <s:submit onclick="return cancel();" theme="simple" - key="pollen.action.cancel"/> - <s:submit key="pollen.action.delete" theme="simple" action="deleteUser"/> + <s:submit onclick="return cancel();" theme="simple" key="pollen.action.cancel"/> + <s:submit key="pollen.action.delete" theme="simple"/> </div> </fieldset> </s:form> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp index 65bceb9..4622f20 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp @@ -82,8 +82,7 @@ <br/> -<s:form id='createForm' method="POST" namespace="/admin" - cssClass="hidden userForm"> +<s:form id='createForm' method="POST" namespace="/admin" action="create" cssClass="hidden userForm"> <s:hidden name="action" value="create"/> <fieldset> @@ -102,11 +101,10 @@ label="%{getText('pollen.common.administrator')}"/> </fieldset> <br/> - <s:submit action="create" key="pollen.action.create" align="center"/> + <s:submit key="pollen.action.create" align="center"/> </s:form> -<s:form id='editForm' method="POST" namespace="/admin" - cssClass="hidden userForm"> +<s:form id='editForm' method="POST" namespace="/admin" action="edit" cssClass="hidden userForm"> <s:hidden name="action" value="edit"/> <s:hidden key="editUser.topiaId" label=""/> @@ -126,7 +124,7 @@ <s:hidden key="editUser.email" label=""/> </fieldset> <br/> - <s:submit action="edit" key="pollen.action.validate" align="center"/> + <s:submit key="pollen.action.validate" align="center"/> </s:form> 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 3490dd8..2dccc95 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 @@ -46,10 +46,8 @@ </div> <hr/> <div align="right"> - <s:submit onclick="return cancel();" theme="simple" - key="pollen.action.cancel"/> - <s:submit key="pollen.action.clone" theme="simple" disabled="true" - action="clone/%{pollUri}"/> + <s:submit key="pollen.action.cancel" onclick="return cancel();" theme="simple"/> + <s:submit key="pollen.action.clone" theme="simple" disabled="true"/> </div> </fieldset> </s:form> 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 d07c6ad..0f15cb3 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 @@ -43,10 +43,8 @@ </div> <hr/> <div align="right"> - <s:submit onclick="return cancel();" theme="simple" - key="pollen.action.cancel"/> - <s:submit key="pollen.action.close" theme="simple" - action="close/%{pollUri}"/> + <s:submit key="pollen.action.cancel" onclick="return cancel();" theme="simple"/> + <s:submit key="pollen.action.close" theme="simple"/> </div> </fieldset> </s:form> 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 cca19d6..2959425 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 @@ -43,10 +43,8 @@ </div> <hr/> <div align="right"> - <s:submit onclick="return cancel();" theme="simple" - key="pollen.action.cancel"/> - <s:submit key="pollen.action.delete" theme="simple" - action="delete/%{pollUri}"/> + <s:submit key="pollen.action.cancel" onclick="return cancel();" theme="simple"/> + <s:submit key="pollen.action.delete" theme="simple"/> </div> </fieldset> </s:form> 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 9c0688f..22b2f92 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 @@ -37,9 +37,7 @@ <hr/> <div align="right"> - <s:submit onclick="return closeConfirmDialog();" theme="simple" - key="pollen.action.cancel"/> - <s:submit key="pollen.action.delete" theme="simple" - action="deleteChoice/%{pollUri}"/> + <s:submit key="pollen.action.cancel" onclick="return closeConfirmDialog();" theme="simple"/> + <s:submit key="pollen.action.delete" theme="simple"/> </div> </s:form> 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 cad454f..7136e15 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 @@ -42,9 +42,7 @@ <hr/> <div align="right"> - <s:submit onclick="return closeConfirmDialog();" theme="simple" - key="pollen.action.cancel"/> - <s:submit key="pollen.action.delete" theme="simple" - action="deleteComment/%{pollUri}"/> + <s:submit key="pollen.action.cancel" onclick="return closeConfirmDialog();" theme="simple"/> + <s:submit key="pollen.action.delete" theme="simple"/> </div> </s:form> 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 8a1e6db..52b6bbc 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 @@ -39,9 +39,7 @@ <hr/> <div align="right"> - <s:submit onclick="return closeConfirmDialog();" theme="simple" - key="pollen.action.cancel"/> - <s:submit key="pollen.action.delete" theme="simple" - action="deleteVote/%{pollUri}"/> + <s:submit key="pollen.action.cancel" onclick="return closeConfirmDialog();" theme="simple"/> + <s:submit key="pollen.action.delete" theme="simple"/> </div> </s:form> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp index 1bec920..6b50683 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp @@ -104,7 +104,7 @@ </h1> <s:form method="POST" id="registerForm" namespace="/poll" - enctype="multipart/form-data" cssClass="KForm hidden" action="KForm/create"> + enctype="multipart/form-data" cssClass="KForm hidden"> <s:hidden key="poll.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 cff527e..0d55c93 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 @@ -341,8 +341,7 @@ label='%{getText("pollen.common.voteAnonymous")}'/> <br/> </s:if> - <s:submit action="vote/%{pollUri}" key="pollen.action.pollVote" - align="center"/> + <s:submit key="pollen.action.pollVote" align="center"/> </div> </s:if> </s:form> @@ -374,8 +373,7 @@ <br/> <div class="cleanBoth"> - <s:submit action="addChoice/%{pollUri}" key="pollen.action.addChoice" - align="center"/> + <s:submit key="pollen.action.addChoice" align="center"/> </div> </s:form> </div> @@ -405,8 +403,7 @@ toolbar="PollenToolbar" customConfig="%{configUrl}" editorLocal="%{safeLanguage}" /> <div class="cleanBoth"> - <s:submit action="addComment/%{pollUri}" key="pollen.action.addComment" - align="center"/> + <s:submit key="pollen.action.addComment" align="center"/> </div> </s:form> 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 822c34f..f7cb926 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 @@ -44,10 +44,8 @@ </div> <hr/> <div align="right"> - <s:submit onclick="return cancel();" theme="simple" - key="pollen.action.cancel"/> - <s:submit key="pollen.action.delete" theme="simple" - action="deleteFavoriteList"/> + <s:submit key="pollen.action.cancel" onclick="return cancel();" theme="simple"/> + <s:submit key="pollen.action.delete" theme="simple"/> </div> </fieldset> </s:form> 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 d47ec92..a8b8cad 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 @@ -45,10 +45,8 @@ </div> <hr/> <div align="right"> - <s:submit onclick="return cancel();" theme="simple" - key="pollen.action.cancel"/> - <s:submit key="pollen.action.delete" theme="simple" - action="deletePollAccount"/> + <s:submit key="pollen.action.cancel" onclick="return cancel();" theme="simple"/> + <s:submit key="pollen.action.delete" theme="simple"/> </div> </fieldset> </s:form> 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 e19cb90..9d7640e 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 @@ -96,6 +96,6 @@ tooltip='%{getText("poll.help.pollId")}'/> <br/> - <s:submit action="attachPoll" key="pollen.action.attachPoll"/> + <s:submit key="pollen.action.attachPoll"/> </s:form> </fieldset> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp index 21f5427..23ed356 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp @@ -26,7 +26,7 @@ return false; } </script> -<s:form method="POST" namespace="/user"> +<s:form method="POST" namespace="/user" action="lostPassword"> <fieldset class="ui-widget-content ui-corner-all"> <s:text name="pollen.information.lostPassword"/> @@ -41,8 +41,7 @@ <button onclick="return cancel();"> <s:text name="pollen.action.cancel"/> </button> - <s:submit key="pollen.action.send" theme="simple" - action="lostPassword"/> + <s:submit key="pollen.action.send" theme="simple"/> </div> </fieldset> </s:form> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp index 139bf4c..fc24ec0 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp @@ -29,7 +29,7 @@ <s:text name="pollen.title.myAccount"/> </h1> -<s:form method="POST" namespace="/user"> +<s:form method="POST" namespace="/user" action="edit"> <fieldset> <legend><s:text name="pollen.fieldset.connexionInformation"/></legend> @@ -57,5 +57,5 @@ </s:if> </fieldset> <br/> - <s:submit action="edit" key="pollen.action.validate" align="center"/> + <s:submit key="pollen.action.validate" align="center"/> </s:form> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp index fcd501f..a074adb 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp @@ -94,7 +94,7 @@ <br/> <s:form id='createForm' method="POST" namespace="/user" - cssClass="hidden pollAccountForm"> + cssClass="hidden pollAccountForm" action="addPollAccount"> <s:hidden name="action" value="create"/> <s:hidden key="favoriteListId" label=""/> @@ -109,11 +109,10 @@ </fieldset> <br/> - <s:submit action="addPollAccount" - key="pollen.action.create" align="center"/> + <s:submit key="pollen.action.create" align="center"/> </s:form> -<s:form id='editForm' method="POST" namespace="/user" +<s:form id='editForm' method="POST" namespace="/user" action="editPollAccount" cssClass="hidden pollAccountForm"> <s:hidden name="action" value="edit"/> @@ -130,15 +129,13 @@ label="%{getText('pollen.common.email')}" size="40"/> </fieldset> <br/> - <s:submit action="editPollAccount" key="pollen.action.validate" - align="center"/> + <s:submit key="pollen.action.validate" align="center"/> </s:form> <br/> -<s:form method="POST" namespace="/user"> +<s:form method="POST" namespace="/user" action="favoriteLists"> - <s:submit action="favoriteLists" - key="pollen.action.backToFavoriteLists" align="center"/> + <s:submit key="pollen.action.backToFavoriteLists" align="center"/> </s:form> <sj:dialog id="confirmDialog" autoOpen="false" modal="true" width="500"/> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp index 8787829..a59381f 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp @@ -90,7 +90,7 @@ </sjg:grid> <br/> -<s:form id='createForm' method="POST" namespace="/user" +<s:form id='createForm' method="POST" namespace="/user" action="createFavoriteList" cssClass="hidden favoriteForm" enctype="multipart/form-data"> <fieldset> @@ -107,15 +107,14 @@ size="40"/> </fieldset> <br/> - <s:submit action="createFavoriteList" key="pollen.action.create" - align="center"/> + <s:submit key="pollen.action.create" align="center"/> </s:form> <s:form id='editForm' method="POST" namespace="/user" theme="simple" action="editFavoriteList" cssClass="hidden"> <s:hidden key="favoriteListId" label=""/> - <s:submit action="editFavoriteList"/> + <s:submit key="pollen.action.edit" /> </s:form> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp index 855b6a7..215be6a 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp @@ -32,7 +32,7 @@ <br/> -<s:form id="connection" action="login" method="POST" namespace="/user"> +<s:form id="connection" method="POST" namespace="/user" action="login"> <fieldset> <legend><s:text name="pollen.fieldset.login"/></legend> @@ -46,8 +46,7 @@ </fieldset> <br/> - <s:submit id="submitform" action="login" key="pollen.action.login" - align="center"/> + <s:submit id="submitform" key="pollen.action.login" align="center"/> </s:form> <div class="center" style="margin-bottom:20px;"> <img src="<s:url value='/img/pollen_%{safeLanguage}.png' />" diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp index 7c7929a..95fefd6 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp @@ -53,6 +53,5 @@ key="pollen.common.lastName"/> </fieldset> <br/> - <s:submit action="KAction/register" key="pollen.action.register" - align="center" cssClass="KAction"/> + <s:submit key="pollen.action.register" align="center"/> </s:form> diff --git a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp index 2baf244..419a7e7 100644 --- a/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp +++ b/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp @@ -29,7 +29,7 @@ <s:text name="pollen.title.myAccount"/> </h1> -<s:form method="POST" namespace="/user"> +<s:form method="POST" namespace="/user" action="editInput"> <fieldset> <legend><s:text name="pollen.fieldset.connexionInformation"/></legend> @@ -48,6 +48,5 @@ key="pollen.common.lastName"/> </fieldset> <br/> - <s:submit action="edit" method="input" - key="pollen.action.modify" align="center"/> + <s:submit key="pollen.action.modify" align="center"/> </s:form> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm