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 95eb643101a3ea61927ddade9817a30ebf579de5 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 27 17:00:22 2015 +0100 Plan d'échantillonnage et contacts, colonne Espèces cibles, afficher le nom scientifique et non le nom commun (fixes #6562) --- .../fr/ifremer/wao/services/service/SclerochronologySamplingPlan.java | 2 +- wao-web/src/main/webapp/WEB-INF/content/contacts.jsp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlan.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlan.java index 052a9fe..a4cfd18 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlan.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlan.java @@ -89,7 +89,7 @@ public class SclerochronologySamplingPlan extends SamplingPlan implements Iterab public SclerochronologySamplingPlanSampleRowPart(Locale locale, Map<Date, Effort> effortInIndividualsPerMonths, SampleRow sampleRow, long sampleRowContactCounts) { super(locale, Collections.<Date, Effort>emptyMap(), sampleRow, sampleRowContactCounts); this.effortInIndividualsPerMonths = effortInIndividualsPerMonths; - species = sampleRow.getSpecies().getVernacularName(); + species = sampleRow.getSpecies().getScientificName(); samplingContext = WaoUtils.l(locale, sampleRow.getSclerochronologySamplingContext()); samplingContextInfo = sampleRow.getSclerochronologySamplingContextInfo(); individualMeasurementStrategy = WaoUtils.l(locale, sampleRow.getIndividualMeasurementStrategy()); diff --git a/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp b/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp index d34c5d8..3a3a0e9 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp @@ -476,7 +476,7 @@ <s:if test="sclerochronology"> <s:text name="wao.ui.field.SampleRow.sclerochronologySamplingContext"/> <s:property value="getText(sampleRow.sclerochronologySamplingContext)" escapeHtml="false"/> <s:text name="wao.ui.field.SampleRow.individualMeasurementStrategy"/> <s:property value="getText(sampleRow.individualMeasurementStrategy)" escapeHtml="false"/> - <s:text name="wao.ui.field.SampleRow.species"/> <s:property value="sampleRow.species.vernacularName" escapeHtml="false"/> + <s:text name="wao.ui.field.SampleRow.species"/> <s:property value="sampleRow.species.scientificName" escapeHtml="false"/> </s:if> <s:text name="wao.ui.contacts.FishingZone.facadeName"/> <s:property value="sampleRow.facade" escapeHtml="false"/> <s:text name="wao.ui.contacts.FishingZone.sectorName"/> <s:property value="sampleRow.sectors" escapeHtml="false"/> @@ -516,7 +516,7 @@ <s:property value="getText(sampleRow.individualMeasurementStrategy)"/> </td> <td class="only-in-full-view"> - <s:property value="sampleRow.species.vernacularName"/> + <s:property value="sampleRow.species.scientificName"/> </td> </s:if> <td class="only-in-full-view"> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.