Author: fdesbois Date: 2010-01-17 13:42:06 +0000 (Sun, 17 Jan 2010) New Revision: 209 Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowHistoric.java trunk/suiviobsmer-ui/src/main/webapp/SampleRowForm.tml Log: - No company change possible for SampleRow with real tide time Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java 2010-01-17 13:26:09 UTC (rev 208) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowForm.java 2010-01-17 13:42:06 UTC (rev 209) @@ -624,9 +624,12 @@ programId = null; } - // Save company - Company company = getCompanySelectModel().findObject(companyId); - getSampleRow().setCompany(company); + // No company change possible when sampleRow has real tide time + if (!getSampleRow().hasSampleMonthRealTideTime()) { + // Save company + Company company = getCompanySelectModel().findObject(companyId); + getSampleRow().setCompany(company); + } // Save sampleMonths Modified: trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowHistoric.java =================================================================== --- trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowHistoric.java 2010-01-17 13:26:09 UTC (rev 208) +++ trunk/suiviobsmer-ui/src/main/java/fr/ifremer/suiviobsmer/ui/pages/SampleRowHistoric.java 2010-01-17 13:42:06 UTC (rev 209) @@ -76,7 +76,13 @@ } public String getContent() { - return sampleRowLog.getLogText().replaceAll("\\n", "<br />"); + String content = sampleRowLog.getLogText(); + if (content == null) { + content = "Aucun changement enregistré."; + } else { + content = content.replaceAll("\\n", "<br />"); + } + return content; } } Modified: trunk/suiviobsmer-ui/src/main/webapp/SampleRowForm.tml =================================================================== --- trunk/suiviobsmer-ui/src/main/webapp/SampleRowForm.tml 2010-01-17 13:26:09 UTC (rev 208) +++ trunk/suiviobsmer-ui/src/main/webapp/SampleRowForm.tml 2010-01-17 13:42:06 UTC (rev 209) @@ -146,7 +146,12 @@ </p:code> <p:company> <t:label t:for="company" /> - <input t:type="select" t:id="company" t:model="companySelectModel" value="companyId" /> + <t:if t:test="sampleRow.hasSampleMonthRealTideTime()"> + ${sampleRow.company.name} + <p:else> + <input t:type="select" t:id="company" t:model="companySelectModel" value="companyId" /> + </p:else> + </t:if> </p:company> <p:boats> <t:label t:for="boats" />