Author: bleny Date: 2014-05-19 16:09:48 +0200 (Mon, 19 May 2014) New Revision: 1968 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1968 Log: fixes #4983 migrate to cm for boat length Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-05-19 14:02:14 UTC (rev 1967) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_0__clean_database.sql 2014-05-19 14:09:48 UTC (rev 1968) @@ -18,3 +18,5 @@ where login in (select login from waoUser group by login having count(topiaId) > 1); alter table waouser add constraint login_uniqueness unique (login); + +update boat set boatlength = boatlength * 100; Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-05-19 14:02:14 UTC (rev 1967) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-05-19 14:09:48 UTC (rev 1968) @@ -253,7 +253,7 @@ <s:text name="wao.ui.boats.boatName"/> </th> <th> - <s:text name="wao.ui.boats.boatLength"/> (m) + <s:text name="wao.ui.boats.boatLength"/> (cm) </th> <th> <s:text name="wao.ui.boats.buildYear"/> 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 14:02:14 UTC (rev 1967) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-19 14:09:48 UTC (rev 1968) @@ -357,7 +357,7 @@ <td> <s:set name="boatTooltip"> <s:text name="wao.ui.boats.registrationCode"/> <s:property value="%{'' + boat.immatriculation}" escapeHtml="false"/> - <s:text name="wao.ui.boats.boatLength"/> <s:property value="boat.boatLength" escapeHtml="false"/> m + <s:text name="wao.ui.boats.boatLength"/> <s:property value="boat.boatLength" escapeHtml="false"/> cm <s:text name="wao.ui.boats.buildYear"/> <s:property value="%{'' + boat.buildYear}" escapeHtml="false"/> <s:text name="wao.ui.boats.district"/> <s:property value="boat.district.districtName" escapeHtml="false"/> (<s:property value="boat.district.districtCode" escapeHtml="false"/>) </s:set>