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 141f8e230ea90d4a6fa8602a1b4bb7197a6b3e47 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Dec 23 10:46:45 2014 +0100 On garde un libellé « Société » pour obsmer et obsvente de le formulaire de modification d'une ligne du plan --- wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp b/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp index 0b3bc70..31108ae 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp @@ -260,8 +260,13 @@ cssClass="input-small" /> </s:if> + <s:set name="organisationLabel"><s:text name="wao.ui.field.SampleRow.organisation" /></s:set> + <s:if test="updateSampleRowCommand.sampleRow.obsProgram.obsMer || updateSampleRowCommand.sampleRow.obsProgram.obsVente"> + <s:set name="organisationLabel"><s:text name="wao.ui.entity.Company" /></s:set> + </s:if> + <s:select name="updateSampleRowCommand.organisationId" - label="%{getText('wao.ui.field.SampleRow.organisation')}" + label="%{#organisationLabel}" disabled="updateSampleRowCommand.observationAlreadyStarted" list="updateSampleRowCommand.allOrganisations" listValue="%{value.fullName}" -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.