Author: bleny Date: 2014-05-19 15:57:46 +0200 (Mon, 19 May 2014) New Revision: 1966 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1966 Log: refs #4487 review accept/refuse js code Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-19 13:28:44 UTC (rev 1965) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-19 13:57:46 UTC (rev 1966) @@ -40,22 +40,22 @@ $('table.contacts-list').toggleClass('full-view').toggleClass('compact-view'); }); - $('.validation-action').click(function() { + $('.validation-action').click(function(e) { + e.preventDefault(); var $action = $(this); - var url = $action.attr('data'); + var url = $action.attr('href'); var successCallback = function (data) { - var succesful = data['successful']; - - if (!succesful) { + var successful = data['successful']; + if (successful) { + var success = data['successMessage']; + WAO.notifications.success(success); + // TODO Update line and data actions + } else { var error = data['errorMessage']; WAO.notifications.error(error); - } else { - var success = data['successMessage']; - WAO.notifications.success(success); - //TODO Update line and data actions } }; - WAO.get(url, null, successCallback); + WAO.post(url, {}, successCallback); }); // Do not expose any struts internal input fields @@ -553,7 +553,7 @@ <s:param name="contactId" value="topiaId"/> <s:param name="validationState">true</s:param> </s:url> - <s:a cssClass='validation-action' href="#notifications" data="%{acceptContactUrl}"> + <s:a cssClass="validation-action" href="%{acceptContactUrl}"> <s:text name="wao.ui.action.acceptContact"/> </s:a> </li> @@ -562,7 +562,7 @@ <s:param name="contactId" value="topiaId"/> <s:param name="validationState">false</s:param> </s:url> - <s:a cssClass='validation-action' href="#notifications" data="%{refuseContactUrl}"> + <s:a cssClass="validation-action" href="%{refuseContactUrl}"> <s:text name="wao.ui.action.refuseContact"/> </s:a> </li> @@ -572,7 +572,7 @@ <s:url action="validate-contact-json" id="unvalidateContactUrl"> <s:param name="contactId" value="topiaId"/> </s:url> - <s:a cssClass='validation-action' href="#notifications" data="%{unvalidateContactUrl}"> + <s:a cssClass="validation-action" href="%{unvalidateContactUrl}"> <s:text name="wao.ui.action.unvalidateContact"/> </s:a> </li>