Author: bleny Date: 2014-06-23 22:59:08 +0200 (Mon, 23 Jun 2014) New Revision: 2097 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2097 Log: fixes #5319 confirm before sample row deletion Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-23 20:52:12 UTC (rev 2096) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-23 20:59:08 UTC (rev 2097) @@ -49,7 +49,7 @@ wao.ui.action.deleteNews=Supprimer la nouvelle wao.ui.action.deleteNews.confirm=Êtes-vous sûr de vouloir supprimer définitivement cette nouvelle ? wao.ui.action.deleteSampleRow=Supprimer la ligne du plan -wao.ui.action.deleteSampleRow.confirm=Êtes-vous sûr de vouloir supprimer la ligne %s du plan ? +wao.ui.action.deleteSampleRow.confirm=Êtes-vous sûr de vouloir supprimer cette ligne du plan ? wao.ui.action.deleteSampleRow.failure=Impossible de supprimer la ligne %s wao.ui.action.deleteSampleRow.success=La ligne %s a bien été supprimée wao.ui.action.deleteUser=Supprimer l'utilisateur 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-06-23 20:52:12 UTC (rev 2096) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp 2014-06-23 20:59:08 UTC (rev 2097) @@ -71,7 +71,7 @@ if ( ! confirm("<s:text name="wao.ui.action.deleteContact.confirm"/>")) { e.preventDefault(); } - }) + }); }); Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp 2014-06-23 20:52:12 UTC (rev 2096) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp 2014-06-23 20:59:08 UTC (rev 2097) @@ -84,6 +84,13 @@ $periodBeginInput.change(updateExpectedObservationsByMonthsTable); $periodEndInput.change(updateExpectedObservationsByMonthsTable); + + $('#delete-sample-row-link').click(function (e) { + if ( ! confirm("<s:text name="wao.ui.action.deleteSampleRow.confirm"/>")) { + e.preventDefault(); + } + }); + }); </script> @@ -269,7 +276,7 @@ <s:url action="delete-sample-row" id="deleteSampleRowUrl"> <s:param name="sampleRowId" value="sampleRowId" /> </s:url> - <s:a href="%{deleteSampleRowUrl}" cssClass="btn pull-right"> + <s:a href="%{deleteSampleRowUrl}" cssClass="btn pull-right" id="delete-sample-row-link"> <i class="icon-trash"></i> <s:text name="wao.ui.action.deleteSampleRow" /> </s:a> </s:if>