This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 5b554cb035f58f547118fb495ea6727a3e91f022 Author: Brendan Le Ny <bleny@codelutin.com> Date: Wed Feb 18 14:44:31 2015 +0100 On renomme la colonne « Zone de pêche » du plan en « Division » pour correspondre avec les filtres (testable-client #6679) --- wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp | 2 +- wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp | 2 +- .../src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp b/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp index f846885..d3c15fe 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp @@ -280,7 +280,7 @@ <s:text name="wao.ui.entity.Company"/> </th> </s:if> - <th><s:text name="wao.ui.entity.FishingZone"/></th> + <th><s:text name="wao.ui.field.FishingZone.districtCode"/></th> <th class="only-in-full-view"><s:text name="wao.ui.samplingPlan.fishingZoneInfo"/></th> <th class="only-in-full-view"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.dcf5Code"/></th> <th class="only-in-full-view"><s:text name="wao.ui.misc.METIER"/> <br/> <s:text name="wao.ui.field.SampleRow.meshSize"/></th> diff --git a/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp b/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp index db8f137..ca82536 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp @@ -234,7 +234,7 @@ <s:text name="wao.ui.entity.Company"/> </th> </s:if> - <th><s:text name="wao.ui.entity.FishingZone"/></th> + <th><s:text name="wao.ui.field.FishingZone.districtCode"/></th> <th class="only-in-full-view"><s:text name="wao.ui.samplingPlan.fishingZoneInfo"/></th> <th><s:text name="wao.ui.field.SampleRow.terrestrialLocations"/></th> <th><s:text name="wao.ui.field.SampleRow.terrestrialLocationInfos"/></th> diff --git a/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp b/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp index 0e97854..dc670e0 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp @@ -233,7 +233,7 @@ <th class="only-in-full-view"> <s:text name="wao.ui.entity.Organisation"/> </th> - <th><s:text name="wao.ui.entity.FishingZone"/></th> + <th><s:text name="wao.ui.field.FishingZone.districtCode"/></th> <th class="only-in-full-view"><s:text name="wao.ui.samplingPlan.fishingZoneInfo"/></th> <th><s:text name="wao.ui.field.SampleRow.sclerochronologySamplingContext"/></th> <th><s:text name="wao.ui.field.SampleRow.sclerochronologySamplingContextInfo"/></th> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.