Author: bleny Date: 2014-10-07 11:30:00 +0200 (Tue, 07 Oct 2014) New Revision: 2282 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2282 Log: ?\195?\128 la sortie du formulaire de modification d'un contact, on retourne ?\195?\160 la page sur laquelle on se trouvait (fixes #5746) Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java 2014-10-07 09:16:34 UTC (rev 2281) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ContactsAction.java 2014-10-07 09:30:00 UTC (rev 2282) @@ -251,4 +251,7 @@ return unacceptable; } + public int getPageNumber() { + return pageNumber; + } } \ No newline at end of file Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-10-07 09:16:34 UTC (rev 2281) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-10-07 09:30:00 UTC (rev 2282) @@ -87,7 +87,7 @@ * @author Tony Chemit <chemit@codelutin.com> * @since 4.0 */ -@Results({@Result(name = "success", type = "redirectAction", params = {"actionName", "contacts"})}) +@Results({@Result(name = "success", type = "redirectAction", params = {"actionName", "contacts", "pageNumber", "%{returnToPageNumber}"})}) public class EditContactAction extends WaoJspActionSupport implements Preparable { private static final long serialVersionUID = 1L; @@ -121,6 +121,8 @@ protected UpdateContactCommand updateContactCommand; + protected int returnToPageNumber; + public void setService(ContactsService service) { this.service = service; } @@ -185,6 +187,10 @@ return formatDate(new Date()); } + public void setReturnToPageNumber(int returnToPageNumber) { + this.returnToPageNumber = returnToPageNumber; + } + @Override public void prepare() { @@ -346,4 +352,8 @@ } + public int getReturnToPageNumber() { + return returnToPageNumber; + } + } \ No newline at end of file Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp 2014-10-07 09:16:34 UTC (rev 2281) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp 2014-10-07 09:30:00 UTC (rev 2282) @@ -591,8 +591,9 @@ <s:else> <s:set name="focusAnchor">coordinatorOrObserverFocus</s:set> </s:else> - <s:url action="edit-contact!input" id="editContactUrl" anchor='%{focusAnchor}'> + <s:url action="edit-contact!input" id="editContactUrl" anchor="%{focusAnchor}"> <s:param name="contactId" value="topiaId"/> + <s:param name="returnToPageNumber" value="pageNumber"/> </s:url> <s:a href="%{editContactUrl}"> <i class="icon-edit"></i> <s:text name="wao.ui.action.editOrDeleteContact"/> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp 2014-10-07 09:16:34 UTC (rev 2281) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp 2014-10-07 09:30:00 UTC (rev 2282) @@ -225,6 +225,8 @@ <s:hidden name="contactId" value="%{contactId}"/> + <s:hidden name="returnToPageNumber" value="%{returnToPageNumber}"/> + <%--Do not remove the id (use by contacts page)--%> <fieldset id="coordinatorOrObserverFocus"> <legend><s:text name="wao.ui.misc.observers"/></legend> @@ -379,7 +381,9 @@ </fieldset> <div class="form-actions"> - <s:url action="contacts" id="contactsUrl"/> + <s:url action="contacts" id="contactsUrl"> + <s:param name="pageNumber" value="returnToPageNumber"/> + </s:url> <s:a href="%{contactsUrl}" cssClass="btn"> <i class="icon-chevron-left"></i> <s:text name="wao.ui.action.cancel"/> </s:a>