[tutti] branch develop updated (b47cae5 -> f876550)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from b47cae5 fixes #5879 [IMPORT BIGFIN] plusieurs anomalies new f876550 fixes #5906: [Macrodéchet] Problème d'affichage du contenu de la liste des catégories The 1 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 f876550840968e845349e2e4e3e3a949cbb0e0c2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 3 11:47:56 2014 +0200 fixes #5906: [Macrodéchet] Problème d'affichage du contenu de la liste des catégories Summary of changes: src/site/rst/referential.rst | 2 +- tutti-persistence/src/main/resources/queries-failsafe.hbm.xml | 2 +- 2 files 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 in repository tutti. See http://git.codelutin.com/tutti.git commit f876550840968e845349e2e4e3e3a949cbb0e0c2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 3 11:47:56 2014 +0200 fixes #5906: [Macrodéchet] Problème d'affichage du contenu de la liste des catégories --- src/site/rst/referential.rst | 2 +- tutti-persistence/src/main/resources/queries-failsafe.hbm.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/site/rst/referential.rst b/src/site/rst/referential.rst index 58849c1..040f140 100644 --- a/src/site/rst/referential.rst +++ b/src/site/rst/referential.rst @@ -330,7 +330,7 @@ Paramètres : SELECT qv.id AS id, - case when (qv.name = qv.description) then qv.name else concat(qv.name, ' - ', qv.description) end AS name, + CASE WHEN (qv.description IS NULL OR qv.name = qv.description) THEN qv.name ELSE concat(qv.name, ' - ', qv.description) END AS description, qv.status AS status FROM PmfmImpl p JOIN p.qualitativeValues qv diff --git a/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml b/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml index f8382ca..b5f412b 100644 --- a/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml +++ b/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml @@ -866,7 +866,7 @@ SELECT qv.id AS id, qv.name, - case when (qv.description is null) then qv.name else qv.description end AS description, + case when (qv.description is null OR qv.name = qv.description) then qv.name else concat(qv.name, ' - ', qv.description) end AS description, qv.status AS status FROM PmfmImpl p JOIN p.qualitativeValues qv -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm