Author: bleny Date: 2014-06-26 11:14:21 +0200 (Thu, 26 Jun 2014) New Revision: 2107 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2107 Log: fixes #5311 validate postal code Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties trunk/wao-web/src/main/webapp/WEB-INF/content/boat-details.jsp Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-25 16:41:58 UTC (rev 2106) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-06-26 09:14:21 UTC (rev 2107) @@ -283,6 +283,7 @@ wao.ui.form.Boat.name=Name wao.ui.form.Boat.registrationCode=Registration number wao.ui.form.BoatInfos.success=Modifications successfuly saved +wao.ui.form.BoatInfos.validation.invalidPostalCode=This is not a valid postal code wao.ui.form.Company.error.nameMustBeUnique=Company name must be unique wao.ui.form.Company.title.creation=Create a new company wao.ui.form.Company.title.edition=Edit company %s 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-25 16:41:58 UTC (rev 2106) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-06-26 09:14:21 UTC (rev 2107) @@ -283,6 +283,7 @@ wao.ui.form.Boat.name=Nom wao.ui.form.Boat.registrationCode=Immatriculation wao.ui.form.BoatInfos.success=Les informations ont bien été enregistrées +wao.ui.form.BoatInfos.validation.invalidPostalCode=Ce n'est pas un code postal valide wao.ui.form.Company.error.nameMustBeUnique=Le nom de la société doit être unique wao.ui.form.Company.title.creation=Création d'une société wao.ui.form.Company.title.edition=Modification de la société %s Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/boat-details.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/boat-details.jsp 2014-06-25 16:41:58 UTC (rev 2106) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/boat-details.jsp 2014-06-26 09:14:21 UTC (rev 2107) @@ -31,14 +31,18 @@ var $unlockBoatInfosFormButton = $('#unlock-boat-infos-form'); $saveBoatInfosButton.click(function () { - $boatInfosForm.find('input, textarea').attr('readonly', 'readonly'); - $saveBoatInfosButton.attr('disabled', 'disabled'); - $unlockBoatInfosFormButton.removeAttr('disabled'); var data = WAO.toData($boatInfosForm); - var successCallback = function () { - WAO.notifications.success('<s:text name="wao.ui.form.BoatInfos.success"/>'); + if ( ! data['boatInfos.contactPostalCode'].match(/^[\d ]*$/)) { + alert("<s:text name="wao.ui.form.BoatInfos.validation.invalidPostalCode"/>"); + } else { + $boatInfosForm.find('input, textarea').attr('readonly', 'readonly'); + $saveBoatInfosButton.attr('disabled', 'disabled'); + $unlockBoatInfosFormButton.removeAttr('disabled'); + var successCallback = function () { + WAO.notifications.success('<s:text name="wao.ui.form.BoatInfos.success"/>'); + }; + WAO.post(WAO.UPDATE_BOAT_INFOS_JSON_URL, data, successCallback); } - WAO.post(WAO.UPDATE_BOAT_INFOS_JSON_URL, data, successCallback); }); $unlockBoatInfosFormButton.click(function () {