branch develop-4.x updated (ef33f41 -> 0f13fc3)
This is an automated email from the git hooks/post-receive script. New change to branch develop-4.x in repository tutti. See http://git.codelutin.com/tutti.git from ef33f41 Fixes #7921 Merge branch 'feature/7921' into develop-4.x new 3b4f4fb Correction de la règle de validation (See #8042) new 0f13fc3 Fixes #8042 Merge branch 'feature/8042' into develop-4.x The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 0f13fc3fec379a34c448b2883dec63f36411a1c0 Merge: ef33f41 3b4f4fb Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 7 08:39:36 2016 +0100 Fixes #8042 Merge branch 'feature/8042' into develop-4.x commit 3b4f4fb81d506db114150023992a688d9c74ef38 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 7 08:39:32 2016 +0100 Correction de la règle de validation (See #8042) Summary of changes: .../entities/seine/SchoolEstimate-n1-update-error-validation.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository tutti. See http://git.codelutin.com/tutti.git commit 3b4f4fb81d506db114150023992a688d9c74ef38 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 7 08:39:32 2016 +0100 Correction de la règle de validation (See #8042) --- .../entities/seine/SchoolEstimate-n1-update-error-validation.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/observe-validation/src/main/resources/fr/ird/observe/entities/seine/SchoolEstimate-n1-update-error-validation.xml b/observe-validation/src/main/resources/fr/ird/observe/entities/seine/SchoolEstimate-n1-update-error-validation.xml index 1f7763a..68b4d9c 100644 --- a/observe-validation/src/main/resources/fr/ird/observe/entities/seine/SchoolEstimate-n1-update-error-validation.xml +++ b/observe-validation/src/main/resources/fr/ird/observe/entities/seine/SchoolEstimate-n1-update-error-validation.xml @@ -48,7 +48,7 @@ <!-- l'un des deux weight doit etre renseignee --> <field-validator type="fieldexpression"> <param name="expression"> - <![CDATA[ (totalWeight !=null && totalWeight > 0) || (meanWeight !=null && meanWeight > 0) ]]> + <![CDATA[ (totalWeight != null && totalWeight > 0) || (meanWeight != null && meanWeight > 0) ]]> </param> <message>validator.schoolEstimate.required.weight</message> </field-validator> @@ -60,7 +60,7 @@ <!-- l'un des deux weight doit etre renseignee --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ (weight !=null && weight > 0) || (meanWeight !=null && meanWeight > 0) ]]> + <![CDATA[ (totalWeight != null && totalWeight > 0) || (meanWeight != null && meanWeight > 0) ]]> </param> <message>validator.schoolEstimate.required.weight</message> </field-validator> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository tutti. See http://git.codelutin.com/tutti.git commit 0f13fc3fec379a34c448b2883dec63f36411a1c0 Merge: ef33f41 3b4f4fb Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 7 08:39:36 2016 +0100 Fixes #8042 Merge branch 'feature/8042' into develop-4.x .../entities/seine/SchoolEstimate-n1-update-error-validation.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm