September 2014 - Wao-commits - mailman.cloud.codelutin.com

r2264 - branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action
by bleny＠users.forge.codelutin.com 30 Sep '14

30 Sep '14

Author: bleny Date: 2014-09-30 19:01:19 +0200 (Tue, 30 Sep 2014) New Revision: 2264 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2264 Log: Correction du nom du champ en cas de message d'erreur dans le formulaire de contact Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java =================================================================== --- branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-09-30 17:00:41 UTC (rev 2263) +++ branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-09-30 17:01:19 UTC (rev 2264) @@ -304,7 +304,7 @@ addFieldError("updateContactCommand.contact.observedDataControl", t("wao.ui.form.Contact.error.observedDataControlToCorrectionAsked")); } catch (MissingContactStateMotifException e) { - addFieldError("updateContactCommand.contact.contactStateMotif", t("wao.ui.form.Contact.error.missingContactStateMotif")); + addFieldError("updateContactCommand.contactStateMotifId", t("wao.ui.form.Contact.error.missingContactStateMotif")); } catch (MissingContactDataInputDateException e) { addFieldError("updateContactCommand.contact.dataInputDate", t("wao.ui.form.Contact.error.missingDataInputDate"));

1 0

r2263 - in branches/wao-4.0.x/wao-web/src/main: java/fr/ifremer/wao/web/action resources/i18n
by bleny＠users.forge.codelutin.com 30 Sep '14

30 Sep '14

Author: bleny Date: 2014-09-30 19:00:41 +0200 (Tue, 30 Sep 2014) New Revision: 2263 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2263 Log: On traite l'exception remont?\195?\169e en cas de lieu d'observation manquant par un message d'erreur (fixes #5871) Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_en_GB.properties branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java =================================================================== --- branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-09-30 15:59:39 UTC (rev 2262) +++ branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-09-30 17:00:41 UTC (rev 2263) @@ -327,7 +327,8 @@ addFieldError("updateContactCommand.contact.mammalsInfo", t("wao.ui.form.Contact.error.missingMammalsInfo")); } catch (MissingContactTerrestrialLocationException e) { - throw new UnsupportedOperationException(); + addFieldError("updateContactCommand.terrestrialLocationId", t("wao.ui.form.Contact.error.missingTerrestrialLocation")); + } catch (IllegalAcceptationException e) { throw new IllegalStateException("should never occur", e); } Modified: branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-09-30 15:59:39 UTC (rev 2262) +++ branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-09-30 17:00:41 UTC (rev 2263) @@ -309,6 +309,7 @@ wao.ui.form.Contact.error.missingObservedDataControl=The observed data control must be provided wao.ui.form.Contact.error.missingObserver=The main observer must be provided wao.ui.form.Contact.error.missingRestitution=The restitution date must be provided +wao.ui.form.Contact.error.missingTerrestrialLocation=The terrestrial location of observation must be provided wao.ui.form.Contact.error.observationEndDateAfterToday=Observation end date cannot be after today wao.ui.form.Contact.error.observationEndDateBeforeBeginDate=Observation end date must be after observation begin date wao.ui.form.Contact.error.observedDataControlToCorrectionAsked=Observed data control shows that a correction is asked Modified: branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-09-30 15:59:39 UTC (rev 2262) +++ branches/wao-4.0.x/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-09-30 17:00:41 UTC (rev 2263) @@ -309,6 +309,7 @@ wao.ui.form.Contact.error.missingObservedDataControl=Il faut préciser une valeur pour le contrôle des données observées wao.ui.form.Contact.error.missingObserver=Il ne peut y avoir aucun observateur pour l'état '%s' wao.ui.form.Contact.error.missingRestitution=Il faut préciser une date de transmission de la restitution de la donnée avant de valider +wao.ui.form.Contact.error.missingTerrestrialLocation=Il faut préciser le lieu d'observation wao.ui.form.Contact.error.observationEndDateAfterToday=La date de fin de la marée ne peut pas être postérieure à la date du jour wao.ui.form.Contact.error.observationEndDateBeforeBeginDate=La date de fin d'observation ne peut pas être antérieure à celle du début wao.ui.form.Contact.error.observedDataControlToCorrectionAsked=Un contact ne peut être accepté si le contrôle des données observées indique qu'une correction est demandée

1 0

r2262 - in trunk/wao-web/src/main: java/fr/ifremer/wao/web java/fr/ifremer/wao/web/action webapp webapp/WEB-INF/content/obsmer
by bleny＠users.forge.codelutin.com 30 Sep '14

30 Sep '14

Author: bleny Date: 2014-09-30 17:59:39 +0200 (Tue, 30 Sep 2014) New Revision: 2262 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2262 Log: Prototype pour le plan d'?\195?\169chantillonnage ObsMer, on sauve dans un cookie le choix de mode compact/?\195?\169tendu, par contre on a perdu la valeur par d?\195?\169faut (refs #5746) Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/wao.js Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-09-30 08:41:01 UTC (rev 2261) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java 2014-09-30 15:59:39 UTC (rev 2262) @@ -167,4 +167,10 @@ return WaoUtils.isFrench(getLocale()); } + public boolean isSamplingPlanFullView() { + // FIXME brendan 30/09/14 not used + boolean fullView = getAuthenticatedWaoUser().isAdmin() || getAuthenticatedWaoUser().isProfessional(); + return fullView; + } + } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java 2014-09-30 08:41:01 UTC (rev 2261) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractSamplingPlanAction.java 2014-09-30 15:59:39 UTC (rev 2262) @@ -115,11 +115,6 @@ return filterValues; } - public boolean isFullView() { - boolean fullView = getAuthenticatedWaoUser().isAdmin() || getAuthenticatedWaoUser().isProfessional(); - return fullView; - } - protected SimpleDateFormat dateFormat = new SimpleDateFormat("MM/yyyy"); public boolean isCurrentMonth(Date month) { Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-09-30 08:41:01 UTC (rev 2261) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-09-30 15:59:39 UTC (rev 2262) @@ -86,9 +86,12 @@ $('.estimated-differ-from-real').effect( "highlight", "slow" ) }); + var $views = $('#switch-compact-full-view, table.sampling-plan'); + $views.toggleCompactFullView(WAO.getCookie().samplingPlanFullView); + $('#switch-compact-full-view').click(function () { - $('#switch-compact-full-view').toggleClass('full-view').toggleClass('compact-view'); - $('table.sampling-plan').toggleClass('full-view').toggleClass('compact-view'); + WAO.getCookie().samplingPlanFullView = ! WAO.getCookie().samplingPlanFullView; + $views.toggleCompactFullView(WAO.getCookie().samplingPlanFullView); }); }); @@ -158,7 +161,7 @@ </s:form> <div class="sticky-buttons"> - <button type="button" id="switch-compact-full-view" class="btn <s:if test="fullView">full-view</s:if><s:else>compact-view</s:else>"> + <button type="button" id="switch-compact-full-view" class="btn"> <span class="only-in-compact-view"> <i class="fa fa-expand"></i><span class="only-on-hover"> <s:text name="wao.ui.action.switchToFullView" /></span> </span> @@ -180,7 +183,6 @@ </div> <s:set var="estimatedTides" value="true" /> -<s:set var="fullView" value="%{fullView}" /> <s:set var="displayTidesReal" value="true" /> <s:if test="authenticatedWaoUser.authorizedToViewOtherCompanies"> @@ -195,7 +197,7 @@ <s:set var="nbColumnsTotalInFullView" value="%{#nbColumnsForProfessionInFullView + #nbColumnsForMonths + #nbColumnsForOther}" /> <s:set var="nbColumnsTotalInCompactView" value="%{#nbColumnsForProfessionInCompactView + #nbColumnsForMonths + #nbColumnsForOther}" /> - <table id="sampling-plan" class="large-table sampling-plan show-estimated <s:if test="fullView">full-view</s:if><s:else>compact-view</s:else>"> + <table id="sampling-plan" class="large-table sampling-plan show-estimated"> <thead> <tr> <th colspan="<s:property value="#nbColumnsForProfessionInFullView" />" class="only-in-full-view firstline"> Modified: trunk/wao-web/src/main/webapp/wao.js =================================================================== --- trunk/wao-web/src/main/webapp/wao.js 2014-09-30 08:41:01 UTC (rev 2261) +++ trunk/wao-web/src/main/webapp/wao.js 2014-09-30 15:59:39 UTC (rev 2262) @@ -19,6 +19,9 @@ * #L% */ +/* + * Permet d'attacher un évènement à l'appui sur la touche entrée + */ $.fn.enterKey = function (fnc) { return this.each(function () { $(this).keypress(function (e) { @@ -31,6 +34,20 @@ }) } +/* + * Sur un élément permet d'ajouter et de retirer full-view et compact-view + * ou l'inverse selon la valeur de l'argument. + */ +$.fn.toggleCompactFullView = function (fullView) { + return this.each(function () { + if (fullView) { + $(this).addClass('full-view').removeClass('compact-view'); + } else { + $(this).addClass('compact-view').removeClass('full-view'); + } + }) +} + var FilterModel = function (filterValuesUrl) { var self = this; @@ -554,6 +571,7 @@ var self = this; this.notifications = new Notifications(); + this.cookie = null; this.getNestedPropertyValue = function(path, data) { return path.split('.').reduce(function(prev, prop){ @@ -598,13 +616,39 @@ data[parameterName] = parameterValues; }); return data; + }; + + this.newWaoCookie = function () { + var newWaoCookie = { + version: 1, + samplingPlanFullView: false + }; + return newWaoCookie; + }; + + this.getCookie = function () { + if (self.cookie === null) { + // on charge le cookie, s'il n'est pas définit, on en crée un avec les valeur par défaut + self.cookie = $.cookie('wao') || this.newWaoCookie(); + } + return self.cookie; + }; + + this.saveCookie = function () { + if (self.cookie !== null) { + $.cookie('wao', self.cookie); + } } }; $(document).ready(function () { - $.cookie.json = true; + // si la lib est chargée, on la configure + if ($.cookie) { + // on sérialise/désérialise en JSON pour stocker le cookie + $.cookie.json = true; + } // $('a[data-toggle="popover"]').popover(); $('span[data-toggle="tooltip"]').tooltip(); @@ -618,4 +662,11 @@ WAO = new Wao(); -}); \ No newline at end of file +}); + +$(window).unload(function() { + + // en quittant la page, on sauvegarde le cookie + WAO.saveCookie(); + +});

1 0

r2261 - trunk/wao-web/src/main/webapp
by bleny＠users.forge.codelutin.com 30 Sep '14

30 Sep '14

Author: bleny Date: 2014-09-30 10:41:01 +0200 (Tue, 30 Sep 2014) New Revision: 2261 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2261 Log: Stockage du cookie en JSON (refs #5746) Modified: trunk/wao-web/src/main/webapp/wao.js Modified: trunk/wao-web/src/main/webapp/wao.js =================================================================== --- trunk/wao-web/src/main/webapp/wao.js 2014-09-15 13:16:37 UTC (rev 2260) +++ trunk/wao-web/src/main/webapp/wao.js 2014-09-30 08:41:01 UTC (rev 2261) @@ -604,7 +604,7 @@ $(document).ready(function () { - // $('select').select2(); + $.cookie.json = true; // $('a[data-toggle="popover"]').popover(); $('span[data-toggle="tooltip"]').tooltip();

1 0

[ANN] - Wao 4.0.12 released
by codelutin.com Release Notification 15 Sep '14

15 Sep '14

The Wao team is pleased to announce the wao-4.0.12 release! Application pour le suivi contractuels d'observations scientifiques de la pêche Documentation of the project can be found here: http://doc.codelutin.com/wao Changes ------- Changes in this version include: Fixed Bugs: o News : ne pas afficher les news "société" quand on est connecté en Admin Issue: 5778. Thanks to Vincent BADTS. Resolved by bleny. o Problème d'encodage des caractères dans les emails envoyés suite à une capture accientelles Issue: 5774. Thanks to Vincent BADTS. Resolved by bleny. o Fermeture instantannée du navigateur en cliquant sur « Actions » Issue: 5586. Thanks to Anne-Sophie Cornou. Resolved by ascornou. Changes: o Guide observateur : rédaction Issue: 5777. Thanks to Vincent BADTS. Resolved by vbadts. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/wao/files * wao-4.0.12.war - http://forge.codelutin.com/attachments/download/2279 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Wao team

1 0

r2260 - in branches/wao-4.0.x: . wao-persistence wao-services wao-web
by maven-release＠users.forge.codelutin.com 15 Sep '14

15 Sep '14

Author: maven-release Date: 2014-09-15 15:16:37 +0200 (Mon, 15 Sep 2014) New Revision: 2260 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2260 Log: [maven-release-plugin] prepare for next development iteration Modified: branches/wao-4.0.x/pom.xml branches/wao-4.0.x/wao-persistence/pom.xml branches/wao-4.0.x/wao-services/pom.xml branches/wao-4.0.x/wao-web/pom.xml Modified: branches/wao-4.0.x/pom.xml =================================================================== --- branches/wao-4.0.x/pom.xml 2014-09-15 13:16:31 UTC (rev 2259) +++ branches/wao-4.0.x/pom.xml 2014-09-15 13:16:37 UTC (rev 2260) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.12</version> + <version>4.0.13-SNAPSHOT</version> <packaging>pom</packaging> <name>Wao</name> @@ -86,9 +86,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.codelutin.com/wao/tags/wao-4.0.12</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/wao/tags/wao-4.0.12</developerConnection> - <url>https://forge.codelutin.com/repositories/browse/wao/tags/wao-4.0.12</url> + <connection>scm:svn:http://svn.codelutin.com/wao/branches/wao-4.0.x</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/wao/branches/wao-4.0.x</developerConnection> + <url>https://forge.codelutin.com/repositories/browse/wao/branches/wao-4.0.x</url> </scm> <properties> Modified: branches/wao-4.0.x/wao-persistence/pom.xml =================================================================== --- branches/wao-4.0.x/wao-persistence/pom.xml 2014-09-15 13:16:31 UTC (rev 2259) +++ branches/wao-4.0.x/wao-persistence/pom.xml 2014-09-15 13:16:37 UTC (rev 2260) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.12</version> + <version>4.0.13-SNAPSHOT</version> </parent> <artifactId>wao-persistence</artifactId> Modified: branches/wao-4.0.x/wao-services/pom.xml =================================================================== --- branches/wao-4.0.x/wao-services/pom.xml 2014-09-15 13:16:31 UTC (rev 2259) +++ branches/wao-4.0.x/wao-services/pom.xml 2014-09-15 13:16:37 UTC (rev 2260) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.12</version> + <version>4.0.13-SNAPSHOT</version> </parent> <artifactId>wao-services</artifactId> Modified: branches/wao-4.0.x/wao-web/pom.xml =================================================================== --- branches/wao-4.0.x/wao-web/pom.xml 2014-09-15 13:16:31 UTC (rev 2259) +++ branches/wao-4.0.x/wao-web/pom.xml 2014-09-15 13:16:37 UTC (rev 2260) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.12</version> + <version>4.0.13-SNAPSHOT</version> </parent> <artifactId>wao-web</artifactId>

1 0

r2259 - in tags: . wao-4.0.12
by maven-release＠users.forge.codelutin.com 15 Sep '14

15 Sep '14

Author: maven-release Date: 2014-09-15 15:16:31 +0200 (Mon, 15 Sep 2014) New Revision: 2259 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2259 Log: [maven-release-plugin] copy for tag wao-4.0.12 Added: tags/wao-4.0.12/ Property changes on: tags/wao-4.0.12 ___________________________________________________________________ Added: svn:mergeinfo + /branches/wao-4.0-obsvente:2075-2085 Added: svn:ignore + *.idea *.iml target atlassian-ide-plugin.xml

1 0

r2258 - in branches/wao-4.0.x: . wao-persistence wao-services wao-web
by maven-release＠users.forge.codelutin.com 15 Sep '14

15 Sep '14

Author: maven-release Date: 2014-09-15 15:16:26 +0200 (Mon, 15 Sep 2014) New Revision: 2258 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2258 Log: [maven-release-plugin] prepare release wao-4.0.12 Modified: branches/wao-4.0.x/pom.xml branches/wao-4.0.x/wao-persistence/pom.xml branches/wao-4.0.x/wao-services/pom.xml branches/wao-4.0.x/wao-web/pom.xml Modified: branches/wao-4.0.x/pom.xml =================================================================== --- branches/wao-4.0.x/pom.xml 2014-09-15 13:15:22 UTC (rev 2257) +++ branches/wao-4.0.x/pom.xml 2014-09-15 13:16:26 UTC (rev 2258) @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.12-SNAPSHOT</version> + <version>4.0.12</version> <packaging>pom</packaging> <name>Wao</name> @@ -86,9 +86,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.codelutin.com/wao/branches/wao-4.0.x</connection> - <developerConnection>scm:svn:https://svn.codelutin.com/wao/branches/wao-4.0.x</developerConnection> - <url>https://forge.codelutin.com/repositories/browse/wao/branches/wao-4.0.x</url> + <connection>scm:svn:http://svn.codelutin.com/wao/tags/wao-4.0.12</connection> + <developerConnection>scm:svn:https://svn.codelutin.com/wao/tags/wao-4.0.12</developerConnection> + <url>https://forge.codelutin.com/repositories/browse/wao/tags/wao-4.0.12</url> </scm> <properties> Modified: branches/wao-4.0.x/wao-persistence/pom.xml =================================================================== --- branches/wao-4.0.x/wao-persistence/pom.xml 2014-09-15 13:15:22 UTC (rev 2257) +++ branches/wao-4.0.x/wao-persistence/pom.xml 2014-09-15 13:16:26 UTC (rev 2258) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.12-SNAPSHOT</version> + <version>4.0.12</version> </parent> <artifactId>wao-persistence</artifactId> Modified: branches/wao-4.0.x/wao-services/pom.xml =================================================================== --- branches/wao-4.0.x/wao-services/pom.xml 2014-09-15 13:15:22 UTC (rev 2257) +++ branches/wao-4.0.x/wao-services/pom.xml 2014-09-15 13:16:26 UTC (rev 2258) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.12-SNAPSHOT</version> + <version>4.0.12</version> </parent> <artifactId>wao-services</artifactId> Modified: branches/wao-4.0.x/wao-web/pom.xml =================================================================== --- branches/wao-4.0.x/wao-web/pom.xml 2014-09-15 13:15:22 UTC (rev 2257) +++ branches/wao-4.0.x/wao-web/pom.xml 2014-09-15 13:16:26 UTC (rev 2258) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.0.12-SNAPSHOT</version> + <version>4.0.12</version> </parent> <artifactId>wao-web</artifactId>

1 0

r2257 - in trunk: . wao-services wao-services/src/main/java/fr/ifremer/wao/services/service/administration wao-services/src/main/java/fr/ifremer/wao/services/service/mail wao-services/src/test/java/fr/ifremer/wao/services/service/mail wao-web/src/main/java/fr/ifremer/wao/web
by bleny＠users.forge.codelutin.com 15 Sep '14

15 Sep '14

Author: bleny Date: 2014-09-15 15:15:22 +0200 (Mon, 15 Sep 2014) New Revision: 2257 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2257 Log: Fusion des changements effectu?\195?\169s en 0.4.x vers la 4.1 Modified: trunk/ trunk/pom.xml trunk/wao-services/pom.xml trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/NewsService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/mail/EmailServiceTest.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/wao-4.0-obsvente:2075-2085 /branches/wao-4.0.x:2169-2249 + /branches/wao-4.0-obsvente:2075-2085 /branches/wao-4.0.x:2169-2256 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-09-15 13:11:00 UTC (rev 2256) +++ trunk/pom.xml 2014-09-15 13:15:22 UTC (rev 2257) @@ -109,7 +109,7 @@ <mockitoVersion>1.9.5</mockitoVersion> <postgresqlDriverVersion>9.3-1102-jdbc41</postgresqlDriverVersion> <commonsEmailVersion>1.3.2</commonsEmailVersion> - <mustacheVersion>0.8.15</mustacheVersion> + <mustacheVersion>1.9</mustacheVersion> <commonsCodecVersion>1.9</commonsCodecVersion> <ehCacheVersion>2.6.9</ehCacheVersion> <jFreeChartVersion>1.0.13</jFreeChartVersion> @@ -259,8 +259,8 @@  <dependency> - <groupId>com.github.spullara.mustache.java</groupId> - <artifactId>compiler</artifactId> + <groupId>com.samskivert</groupId> + <artifactId>jmustache</artifactId> <version>${mustacheVersion}</version> </dependency> Modified: trunk/wao-services/pom.xml =================================================================== --- trunk/wao-services/pom.xml 2014-09-15 13:11:00 UTC (rev 2256) +++ trunk/wao-services/pom.xml 2014-09-15 13:15:22 UTC (rev 2257) @@ -41,8 +41,8 @@ </dependency> <dependency> - <groupId>com.github.spullara.mustache.java</groupId> - <artifactId>compiler</artifactId> + <groupId>com.samskivert</groupId> + <artifactId>jmustache</artifactId> </dependency> <dependency> Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/NewsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/NewsService.java 2014-09-15 13:11:00 UTC (rev 2256) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/NewsService.java 2014-09-15 13:15:22 UTC (rev 2257) @@ -44,10 +44,13 @@ // on ne veut que les news pour le programme et 'null' pour les news publiées pour tous les programmes query.addIn(News.PROPERTY_OBS_PROGRAM, Lists.newArrayList(authenticatedWaoUser.getObsProgram(), null)); - // on ne veut que les news publiées par le programme et les news publiées par la même société que l'utilisateur connecté - if ( ! authenticatedWaoUser.isAdmin()) { + if (authenticatedWaoUser.isCoordinatorOrObserver()) { + // on veut les news publiées par le programme et les news internes de la société Company company = authenticatedWaoUser.getWaoUser().getCompany(); query.addIn(News.PROPERTY_COMPANY, Lists.newArrayList(company, null)); + } else { + // uniquement les news publiées par le programme + query.addNull(News.PROPERTY_COMPANY); } // de la plus récente à la plus ancienne Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java 2014-09-15 13:11:00 UTC (rev 2256) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/EmailService.java 2014-09-15 13:15:22 UTC (rev 2257) @@ -21,11 +21,10 @@ * #L% */ -import com.github.mustachejava.DefaultMustacheFactory; -import com.github.mustachejava.Mustache; -import com.github.mustachejava.MustacheFactory; import com.google.common.base.Charsets; import com.google.common.base.Objects; +import com.samskivert.mustache.Mustache; +import com.samskivert.mustache.Template; import fr.ifremer.wao.WaoApplicationConfig; import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.services.service.WaoServiceSupport; @@ -35,7 +34,8 @@ import org.apache.commons.mail.EmailException; import org.apache.commons.mail.SimpleEmail; -import java.io.StringWriter; +import java.io.IOException; +import java.io.InputStreamReader; import java.util.Locale; public class EmailService extends WaoServiceSupport { @@ -131,17 +131,19 @@ Locale locale = mail.getLocale(); - MustacheFactory mustacheFactory = new DefaultMustacheFactory(); + String templateName = "/email/" + mail.getClass().getSimpleName() + "_" + locale.getLanguage() + ".mustache"; - String templateName = "email/" + mail.getClass().getSimpleName() + "_" + locale.getLanguage() + ".mustache"; + try (InputStreamReader reader = new InputStreamReader(getClass().getResourceAsStream(templateName), Charsets.UTF_8.name())) { - Mustache mustache = mustacheFactory.compile(templateName); + Template template = Mustache.compiler().escapeHTML(false).compile(reader); - StringWriter stringWriter = new StringWriter(); + String body = template.execute(mail); - mustache.execute(stringWriter, mail); + return body; - return stringWriter.toString(); + } catch (IOException e) { + throw new WaoTechnicalException("Unable to read " + templateName, e); + } } Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/mail/EmailServiceTest.java =================================================================== --- trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/mail/EmailServiceTest.java 2014-09-15 13:11:00 UTC (rev 2256) +++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/mail/EmailServiceTest.java 2014-09-15 13:15:22 UTC (rev 2257) @@ -23,6 +23,8 @@ import fr.ifremer.wao.entity.WaoUserImpl; import fr.ifremer.wao.services.AbstractWaoServiceTest; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -31,6 +33,8 @@ public class EmailServiceTest extends AbstractWaoServiceTest { + private static final Log log = LogFactory.getLog(EmailServiceTest.class); + protected EmailService service; @Before @@ -38,19 +42,28 @@ service = newService(EmailService.class); + newMail(); + } + protected UserCredentialsEmail newMail() { + UserCredentialsEmail mail = service.newUserCredentialsEmail(); + WaoUserImpl waoUser = new WaoUserImpl(); + waoUser.setFirstName("F"); + waoUser.setLogin("Login"); + mail.setWaoUser(waoUser); + mail.setNewPassword("taiste'"); + return mail; + } + @Test public void testGetBody() { { serviceContext.setLocale(Locale.FRANCE); - UserCredentialsEmail mail = service.newUserCredentialsEmail(); - mail.setWaoUser(new WaoUserImpl()); - mail.setNewPassword("taiste"); - String body = service.getBody(mail); + String body = service.getBody(newMail()); Assert.assertTrue(body.contains("taiste")); Assert.assertTrue(body.contains("Bonjour")); @@ -59,11 +72,8 @@ { serviceContext.setLocale(Locale.FRENCH); - UserCredentialsEmail mail = service.newUserCredentialsEmail(); - mail.setWaoUser(new WaoUserImpl()); - mail.setNewPassword("taiste"); - String body = service.getBody(mail); + String body = service.getBody(newMail()); Assert.assertTrue(body.contains("taiste")); Assert.assertTrue(body.contains("Bonjour")); @@ -72,11 +82,8 @@ { serviceContext.setLocale(Locale.CANADA_FRENCH); - UserCredentialsEmail mail = service.newUserCredentialsEmail(); - mail.setWaoUser(new WaoUserImpl()); - mail.setNewPassword("taiste"); - String body = service.getBody(mail); + String body = service.getBody(newMail()); Assert.assertTrue(body.contains("taiste")); Assert.assertTrue(body.contains("Bonjour")); @@ -85,11 +92,8 @@ { serviceContext.setLocale(Locale.ENGLISH); - UserCredentialsEmail mail = service.newUserCredentialsEmail(); - mail.setWaoUser(new WaoUserImpl()); - mail.setNewPassword("taiste"); - String body = service.getBody(mail); + String body = service.getBody(newMail()); Assert.assertTrue(body.contains("taiste")); Assert.assertTrue(body.contains("Hi")); @@ -98,11 +102,8 @@ { serviceContext.setLocale(Locale.US); - UserCredentialsEmail mail = service.newUserCredentialsEmail(); - mail.setWaoUser(new WaoUserImpl()); - mail.setNewPassword("taiste"); - String body = service.getBody(mail); + String body = service.getBody(newMail()); Assert.assertTrue(body.contains("taiste")); Assert.assertTrue(body.contains("Hi")); @@ -111,11 +112,8 @@ { serviceContext.setLocale(Locale.CANADA); - UserCredentialsEmail mail = service.newUserCredentialsEmail(); - mail.setWaoUser(new WaoUserImpl()); - mail.setNewPassword("taiste"); - String body = service.getBody(mail); + String body = service.getBody(newMail()); Assert.assertTrue(body.contains("taiste")); Assert.assertTrue(body.contains("Hi")); @@ -123,4 +121,19 @@ } } + @Test + public void mustacheShouldNotEscapeContent() { + + serviceContext.setLocale(Locale.FRANCE); + + String body = service.getBody(newMail()); + + if (log.isDebugEnabled()) { + log.debug("body = \n" + body); + } + + Assert.assertFalse(body.contains("taiste'")); + Assert.assertTrue(body.contains("taiste'")); + + } } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java 2014-09-15 13:11:00 UTC (rev 2256) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java 2014-09-15 13:15:22 UTC (rev 2257) @@ -24,7 +24,6 @@ import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.opensymphony.xwork2.util.LocalizedTextUtil; -import fr.ifremer.wao.ContactsFilter; import fr.ifremer.wao.WaoApplicationConfig; import fr.ifremer.wao.WaoTopiaApplicationContext; import fr.ifremer.wao.WaoTopiaPersistenceContext; @@ -136,7 +135,7 @@ BoatsFilterValuesCacheLoader loader = new BoatsFilterValuesCacheLoader(this); boatsFilterValuesCache = newCacheBuilder(100) . expireAfterAccess(20, TimeUnit.DAYS) - . refreshAfterWrite(20, TimeUnit.MINUTES) + . refreshAfterWrite(1, TimeUnit.DAYS) . build(loader); } return boatsFilterValuesCache; @@ -156,7 +155,7 @@ ContactsFilterValuesCacheLoader loader = new ContactsFilterValuesCacheLoader(this); contactsFilterValuesCache = newCacheBuilder(100) . expireAfterAccess(20, TimeUnit.DAYS) - . refreshAfterWrite(20, TimeUnit.MINUTES) + . refreshAfterWrite(1, TimeUnit.DAYS) . build(loader); } return contactsFilterValuesCache;

1 0

r2256 - branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web
by bleny＠users.forge.codelutin.com 15 Sep '14

15 Sep '14

Author: bleny Date: 2014-09-15 15:11:00 +0200 (Mon, 15 Sep 2014) New Revision: 2256 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2256 Log: Passage ?\195?\160 un rafraichissement des caches apr?\195?\168s 24h Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java =================================================================== --- branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java 2014-09-12 10:20:34 UTC (rev 2255) +++ branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoApplicationContext.java 2014-09-15 13:11:00 UTC (rev 2256) @@ -135,7 +135,7 @@ BoatsFilterValuesCacheLoader loader = new BoatsFilterValuesCacheLoader(this); boatsFilterValuesCache = newCacheBuilder(100) . expireAfterAccess(20, TimeUnit.DAYS) - . refreshAfterWrite(4, TimeUnit.HOURS) + . refreshAfterWrite(1, TimeUnit.DAYS) . build(loader); } return boatsFilterValuesCache; @@ -155,7 +155,7 @@ ContactsFilterValuesCacheLoader loader = new ContactsFilterValuesCacheLoader(this); contactsFilterValuesCache = newCacheBuilder(100) . expireAfterAccess(20, TimeUnit.DAYS) - . refreshAfterWrite(4, TimeUnit.HOURS) + . refreshAfterWrite(1, TimeUnit.DAYS) . build(loader); } return contactsFilterValuesCache;

1 0