- Cantharella-commits - mailman.cloud.codelutin.com

r261 - trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl
by echatellier＠users.forge.codelutin.com March 4, 2014

March 4, 2014

Author: echatellier Date: 2014-03-04 16:34:54 +0100 (Tue, 04 Mar 2014) New Revision: 261 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/261 Log: Format code Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java 2014-03-04 15:26:02 UTC (rev 260) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java 2014-03-04 15:34:54 UTC (rev 261) @@ -304,7 +304,8 @@ ResultatTestBio resultatTestBio = itResultatTestBios.next(); Lot lot = resultatTestBio.getLotSource(); // le lot peut être null pour les tests temoin - if (resultatTestBio.getTypeResultat() != TypeResultat.PRODUIT || !lotService.isLotAccessibleByUser(lot, utilisateur)) { + if (resultatTestBio.getTypeResultat() != TypeResultat.PRODUIT + || !lotService.isLotAccessibleByUser(lot, utilisateur)) { itResultatTestBios.remove(); } }

1 0

r260 - trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document
by echatellier＠users.forge.codelutin.com March 4, 2014

March 4, 2014

Author: echatellier Date: 2014-03-04 16:26:02 +0100 (Tue, 04 Mar 2014) New Revision: 260 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/260 Log: fixes #4634: Make attachemnt image static Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentTooltipColumn.java Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentTooltipColumn.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentTooltipColumn.java 2013-07-02 17:47:49 UTC (rev 259) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentTooltipColumn.java 2014-03-04 15:26:02 UTC (rev 260) @@ -112,9 +112,10 @@ }; add(link); - WebComponent img = new Image("tooltip", new ContextRelativeResource("images/attachment.png")); - img.add(new AttributeModifier("title", messageModel)); - link.add(img); + ContextImage image = new ContextImage("tooltip", Model.of("images/attachment.png")); + image.add(new AttributeModifier("title", messageModel)); + + link.add(image); } }

1 0

r259 - in trunk: . cantharella.data cantharella.service cantharella.utils cantharella.web
by maven-release＠users.forge.codelutin.com July 2, 2013

July 2, 2013

Author: maven-release Date: 2013-07-02 19:47:49 +0200 (Tue, 02 Jul 2013) New Revision: 259 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/259 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/cantharella.data/pom.xml trunk/cantharella.service/pom.xml trunk/cantharella.utils/pom.xml trunk/cantharella.web/pom.xml trunk/pom.xml Modified: trunk/cantharella.data/pom.xml =================================================================== --- trunk/cantharella.data/pom.xml 2013-07-02 17:47:41 UTC (rev 258) +++ trunk/cantharella.data/pom.xml 2013-07-02 17:47:49 UTC (rev 259) @@ -5,7 +5,7 @@ <parent> <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1.3</version> + <version>1.1.4-SNAPSHOT</version> </parent> <artifactId>cantharella.data</artifactId> Modified: trunk/cantharella.service/pom.xml =================================================================== --- trunk/cantharella.service/pom.xml 2013-07-02 17:47:41 UTC (rev 258) +++ trunk/cantharella.service/pom.xml 2013-07-02 17:47:49 UTC (rev 259) @@ -5,7 +5,7 @@ <parent> <artifactId>cantharella</artifactId> <groupId>nc.ird</groupId> - <version>1.1.3</version> + <version>1.1.4-SNAPSHOT</version> </parent> <artifactId>cantharella.service</artifactId> Modified: trunk/cantharella.utils/pom.xml =================================================================== --- trunk/cantharella.utils/pom.xml 2013-07-02 17:47:41 UTC (rev 258) +++ trunk/cantharella.utils/pom.xml 2013-07-02 17:47:49 UTC (rev 259) @@ -5,7 +5,7 @@ <parent> <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1.3</version> + <version>1.1.4-SNAPSHOT</version> </parent> <artifactId>cantharella.utils</artifactId> Modified: trunk/cantharella.web/pom.xml =================================================================== --- trunk/cantharella.web/pom.xml 2013-07-02 17:47:41 UTC (rev 258) +++ trunk/cantharella.web/pom.xml 2013-07-02 17:47:49 UTC (rev 259) @@ -5,7 +5,7 @@ <parent> <artifactId>cantharella</artifactId> <groupId>nc.ird</groupId> - <version>1.1.3</version> + <version>1.1.4-SNAPSHOT</version> </parent> <artifactId>cantharella.web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-02 17:47:41 UTC (rev 258) +++ trunk/pom.xml 2013-07-02 17:47:49 UTC (rev 259) @@ -10,7 +10,7 @@ <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1.3</version> + <version>1.1.4-SNAPSHOT</version> <packaging>pom</packaging> <name>Cantharella</name> <description>Pharmacochemical database of natural substances</description> @@ -67,12 +67,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1.3</url> + <url>http://svn.forge.codelutin.com/svn/cantharella/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1… + scm:svn:http://svn.forge.codelutin.com/svn/cantharella/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1… + scm:svn:http://svn.forge.codelutin.com/svn/cantharella/trunk </developerConnection> </scm>

1 0

r258 - tags
by maven-release＠users.forge.codelutin.com July 2, 2013

July 2, 2013

Author: maven-release Date: 2013-07-02 19:47:41 +0200 (Tue, 02 Jul 2013) New Revision: 258 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/258 Log: [maven-release-plugin] copy for tag cantharella-1.1.3 Added: tags/cantharella-1.1.3/

1 0

r257 - in trunk: . cantharella.data cantharella.service cantharella.utils cantharella.web
by maven-release＠users.forge.codelutin.com July 2, 2013

July 2, 2013

Author: maven-release Date: 2013-07-02 19:47:32 +0200 (Tue, 02 Jul 2013) New Revision: 257 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/257 Log: [maven-release-plugin] prepare release cantharella-1.1.3 Modified: trunk/cantharella.data/pom.xml trunk/cantharella.service/pom.xml trunk/cantharella.utils/pom.xml trunk/cantharella.web/pom.xml trunk/pom.xml Modified: trunk/cantharella.data/pom.xml =================================================================== --- trunk/cantharella.data/pom.xml 2013-07-01 12:32:04 UTC (rev 256) +++ trunk/cantharella.data/pom.xml 2013-07-02 17:47:32 UTC (rev 257) @@ -5,7 +5,7 @@ <parent> <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1.3-SNAPSHOT</version> + <version>1.1.3</version> </parent> <artifactId>cantharella.data</artifactId> Modified: trunk/cantharella.service/pom.xml =================================================================== --- trunk/cantharella.service/pom.xml 2013-07-01 12:32:04 UTC (rev 256) +++ trunk/cantharella.service/pom.xml 2013-07-02 17:47:32 UTC (rev 257) @@ -5,7 +5,7 @@ <parent> <artifactId>cantharella</artifactId> <groupId>nc.ird</groupId> - <version>1.1.3-SNAPSHOT</version> + <version>1.1.3</version> </parent> <artifactId>cantharella.service</artifactId> Modified: trunk/cantharella.utils/pom.xml =================================================================== --- trunk/cantharella.utils/pom.xml 2013-07-01 12:32:04 UTC (rev 256) +++ trunk/cantharella.utils/pom.xml 2013-07-02 17:47:32 UTC (rev 257) @@ -5,7 +5,7 @@ <parent> <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1.3-SNAPSHOT</version> + <version>1.1.3</version> </parent> <artifactId>cantharella.utils</artifactId> Modified: trunk/cantharella.web/pom.xml =================================================================== --- trunk/cantharella.web/pom.xml 2013-07-01 12:32:04 UTC (rev 256) +++ trunk/cantharella.web/pom.xml 2013-07-02 17:47:32 UTC (rev 257) @@ -5,7 +5,7 @@ <parent> <artifactId>cantharella</artifactId> <groupId>nc.ird</groupId> - <version>1.1.3-SNAPSHOT</version> + <version>1.1.3</version> </parent> <artifactId>cantharella.web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-01 12:32:04 UTC (rev 256) +++ trunk/pom.xml 2013-07-02 17:47:32 UTC (rev 257) @@ -10,7 +10,7 @@ <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1.3-SNAPSHOT</version> + <version>1.1.3</version> <packaging>pom</packaging> <name>Cantharella</name> <description>Pharmacochemical database of natural substances</description> @@ -67,12 +67,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/cantharella/trunk</url> + <url>http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1.3</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/cantharella/trunk + scm:svn:http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1… </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/cantharella/trunk + scm:svn:http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1… </developerConnection> </scm>

1 0

r256 - trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl
by echatellier＠users.forge.codelutin.com July 1, 2013

July 1, 2013

Author: echatellier Date: 2013-07-01 14:32:04 +0200 (Mon, 01 Jul 2013) New Revision: 256 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/256 Log: Remove specific case for admin Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java 2013-06-27 09:41:12 UTC (rev 255) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java 2013-07-01 12:32:04 UTC (rev 256) @@ -261,11 +261,6 @@ */ private SearchResult filterResults(SearchResult result, Utilisateur utilisateur) { - // no filtering - if (utilisateur.getTypeDroit() == TypeDroit.ADMINISTRATEUR) { - return result; - } - // get campagnes and lots data to manage rigths List<Campagne> campagnes = new ArrayList<Campagne>(); campagnes.addAll(utilisateur.getCampagnesCreees());

1 0

r255 - in trunk: . cantharella.data cantharella.service cantharella.utils cantharella.web
by maven-release＠users.forge.codelutin.com June 27, 2013

June 27, 2013

Author: maven-release Date: 2013-06-27 11:41:12 +0200 (Thu, 27 Jun 2013) New Revision: 255 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/255 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/cantharella.data/pom.xml trunk/cantharella.service/pom.xml trunk/cantharella.utils/pom.xml trunk/cantharella.web/pom.xml trunk/pom.xml Modified: trunk/cantharella.data/pom.xml =================================================================== --- trunk/cantharella.data/pom.xml 2013-06-27 09:41:05 UTC (rev 254) +++ trunk/cantharella.data/pom.xml 2013-06-27 09:41:12 UTC (rev 255) @@ -5,7 +5,7 @@ <parent> <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1.2</version> + <version>1.1.3-SNAPSHOT</version> </parent> <artifactId>cantharella.data</artifactId> Modified: trunk/cantharella.service/pom.xml =================================================================== --- trunk/cantharella.service/pom.xml 2013-06-27 09:41:05 UTC (rev 254) +++ trunk/cantharella.service/pom.xml 2013-06-27 09:41:12 UTC (rev 255) @@ -5,7 +5,7 @@ <parent> <artifactId>cantharella</artifactId> <groupId>nc.ird</groupId> - <version>1.1.2</version> + <version>1.1.3-SNAPSHOT</version> </parent> <artifactId>cantharella.service</artifactId> Modified: trunk/cantharella.utils/pom.xml =================================================================== --- trunk/cantharella.utils/pom.xml 2013-06-27 09:41:05 UTC (rev 254) +++ trunk/cantharella.utils/pom.xml 2013-06-27 09:41:12 UTC (rev 255) @@ -5,7 +5,7 @@ <parent> <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1.2</version> + <version>1.1.3-SNAPSHOT</version> </parent> <artifactId>cantharella.utils</artifactId> Modified: trunk/cantharella.web/pom.xml =================================================================== --- trunk/cantharella.web/pom.xml 2013-06-27 09:41:05 UTC (rev 254) +++ trunk/cantharella.web/pom.xml 2013-06-27 09:41:12 UTC (rev 255) @@ -5,7 +5,7 @@ <parent> <artifactId>cantharella</artifactId> <groupId>nc.ird</groupId> - <version>1.1.2</version> + <version>1.1.3-SNAPSHOT</version> </parent> <artifactId>cantharella.web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-06-27 09:41:05 UTC (rev 254) +++ trunk/pom.xml 2013-06-27 09:41:12 UTC (rev 255) @@ -10,7 +10,7 @@ <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1.2</version> + <version>1.1.3-SNAPSHOT</version> <packaging>pom</packaging> <name>Cantharella</name> <description>Pharmacochemical database of natural substances</description> @@ -67,12 +67,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1.2</url> + <url>http://svn.forge.codelutin.com/svn/cantharella/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1… + scm:svn:http://svn.forge.codelutin.com/svn/cantharella/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1… + scm:svn:http://svn.forge.codelutin.com/svn/cantharella/trunk </developerConnection> </scm>

1 0

r254 - tags
by maven-release＠users.forge.codelutin.com June 27, 2013

June 27, 2013

Author: maven-release Date: 2013-06-27 11:41:05 +0200 (Thu, 27 Jun 2013) New Revision: 254 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/254 Log: [maven-release-plugin] copy for tag cantharella-1.1.2 Added: tags/cantharella-1.1.2/

1 0

r253 - in trunk: . cantharella.data cantharella.service cantharella.utils cantharella.web
by maven-release＠users.forge.codelutin.com June 27, 2013

June 27, 2013

Author: maven-release Date: 2013-06-27 11:40:54 +0200 (Thu, 27 Jun 2013) New Revision: 253 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/253 Log: [maven-release-plugin] prepare release cantharella-1.1.2 Modified: trunk/cantharella.data/pom.xml trunk/cantharella.service/pom.xml trunk/cantharella.utils/pom.xml trunk/cantharella.web/pom.xml trunk/pom.xml Modified: trunk/cantharella.data/pom.xml =================================================================== --- trunk/cantharella.data/pom.xml 2013-06-27 09:37:45 UTC (rev 252) +++ trunk/cantharella.data/pom.xml 2013-06-27 09:40:54 UTC (rev 253) @@ -5,7 +5,7 @@ <parent> <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.1.2</version> </parent> <artifactId>cantharella.data</artifactId> Modified: trunk/cantharella.service/pom.xml =================================================================== --- trunk/cantharella.service/pom.xml 2013-06-27 09:37:45 UTC (rev 252) +++ trunk/cantharella.service/pom.xml 2013-06-27 09:40:54 UTC (rev 253) @@ -5,7 +5,7 @@ <parent> <artifactId>cantharella</artifactId> <groupId>nc.ird</groupId> - <version>1.1.2-SNAPSHOT</version> + <version>1.1.2</version> </parent> <artifactId>cantharella.service</artifactId> Modified: trunk/cantharella.utils/pom.xml =================================================================== --- trunk/cantharella.utils/pom.xml 2013-06-27 09:37:45 UTC (rev 252) +++ trunk/cantharella.utils/pom.xml 2013-06-27 09:40:54 UTC (rev 253) @@ -5,7 +5,7 @@ <parent> <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.1.2</version> </parent> <artifactId>cantharella.utils</artifactId> Modified: trunk/cantharella.web/pom.xml =================================================================== --- trunk/cantharella.web/pom.xml 2013-06-27 09:37:45 UTC (rev 252) +++ trunk/cantharella.web/pom.xml 2013-06-27 09:40:54 UTC (rev 253) @@ -5,7 +5,7 @@ <parent> <artifactId>cantharella</artifactId> <groupId>nc.ird</groupId> - <version>1.1.2-SNAPSHOT</version> + <version>1.1.2</version> </parent> <artifactId>cantharella.web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-06-27 09:37:45 UTC (rev 252) +++ trunk/pom.xml 2013-06-27 09:40:54 UTC (rev 253) @@ -10,7 +10,7 @@ <groupId>nc.ird</groupId> <artifactId>cantharella</artifactId> - <version>1.1.2-SNAPSHOT</version> + <version>1.1.2</version> <packaging>pom</packaging> <name>Cantharella</name> <description>Pharmacochemical database of natural substances</description> @@ -67,12 +67,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/cantharella/trunk</url> + <url>http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1.2</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/cantharella/trunk + scm:svn:http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1… </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/cantharella/trunk + scm:svn:http://svn.forge.codelutin.com/svn/cantharella/tags/cantharella-1.1… </developerConnection> </scm>

1 0

r252 - in trunk: cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search
by echatellier＠users.forge.codelutin.com June 27, 2013

June 27, 2013

Author: echatellier Date: 2013-06-27 11:37:45 +0200 (Thu, 27 Jun 2013) New Revision: 252 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/252 Log: fixes #2795: Fix security check for TEMOIN test bio Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java 2013-06-24 07:46:22 UTC (rev 251) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/SearchServiceImpl.java 2013-06-27 09:37:45 UTC (rev 252) @@ -37,6 +37,7 @@ import nc.ird.cantharella.data.model.Molecule; import nc.ird.cantharella.data.model.Purification; import nc.ird.cantharella.data.model.ResultatTestBio; +import nc.ird.cantharella.data.model.ResultatTestBio.TypeResultat; import nc.ird.cantharella.data.model.Specimen; import nc.ird.cantharella.data.model.Station; import nc.ird.cantharella.data.model.Utilisateur; @@ -307,7 +308,8 @@ while (itResultatTestBios.hasNext()) { ResultatTestBio resultatTestBio = itResultatTestBios.next(); Lot lot = resultatTestBio.getLotSource(); - if (!lotService.isLotAccessibleByUser(lot, utilisateur)) { + // le lot peut être null pour les tests temoin + if (resultatTestBio.getTypeResultat() != TypeResultat.PRODUIT || !lotService.isLotAccessibleByUser(lot, utilisateur)) { itResultatTestBios.remove(); } } Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java 2013-06-24 07:46:22 UTC (rev 251) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java 2013-06-27 09:37:45 UTC (rev 252) @@ -178,14 +178,6 @@ add(purificationsDataTable); // test bio table - // fix, resultat test bio page must only display produit type (excluding Temoin, Blanc...) - Iterator<ResultatTestBio> itResultatTestBios = searchResult.getResultatTestBios().iterator(); - while (itResultatTestBios.hasNext()) { - ResultatTestBio resultatTestBio = itResultatTestBios.next(); - if (resultatTestBio.getTypeResultat() != TypeResultat.PRODUIT) { - itResultatTestBios.remove(); - } - } DataTable<ResultatTestBio, String> testBiosDataTable = ListTestsBioPage.initTestsBioDataTable(this, "SearchPage.ResultatTestBios.Results", currentPage, searchResult.getResultatTestBios(), testBioService); add(testBiosDataTable);

1 0