Author: fdesbois Date: 2010-06-02 12:07:07 +0000 (Wed, 02 Jun 2010) New Revision: 490 Log: - Update changelog - Ano #2324 : readOnly admin can't access administration page - Use last topia snapshot Modified: trunk/changelog.txt trunk/pom.xml trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/xmi/wao.properties trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-06-02 11:58:03 UTC (rev 489) +++ trunk/changelog.txt 2010-06-02 12:07:07 UTC (rev 490) @@ -6,13 +6,22 @@ 1.2.2 ----- +Anomalies ++++++++++ + +- [fdesbois] Ano #2324 : Un admin en mode lecture peut accéder à la page + administration. +- [fdesbois] Ano #2322 : Erreur sur calendrier d'activité avec navire non chargé. + Mise à jour librairies ++++++++++++++++++++++ - **mavenpom4labs** 2.1.3 -> 2.1.5 [http://maven-site.nuiton.org/mavenpom/mavenpom4labs] - - **i18n** 1.2.1 -> 1.2.2 [http://maven-site.nuiton.org/i18n] +1.2.1 +----- + Anomalies +++++++++ Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-02 11:58:03 UTC (rev 489) +++ trunk/pom.xml 2010-06-02 12:07:07 UTC (rev 490) @@ -235,8 +235,8 @@ <!-- libraries version --> <i18n.version>1.2.2</i18n.version> <nuitonutils.version>1.2.2</nuitonutils.version> - <topia.version>2.3.3</topia.version> - <eugene.version>2.0.1</eugene.version> + <topia.version>2.4-SNAPSHOT</topia.version> + <eugene.version>2.0.2-SNAPSHOT</eugene.version> <tapestry.version>5.1.0.5</tapestry.version> </properties> Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2010-06-02 11:58:03 UTC (rev 489) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2010-06-02 12:07:07 UTC (rev 490) @@ -572,6 +572,8 @@ TopiaContext transaction, List<Object> errorArgs, WaoUser user, Boat boat) throws TopiaException, IOException { + // TODO-fdesbois-2010-05-31 : long execution more than 3sec, need to check which operation cost + errorArgs.add(boat.getName()); errorArgs.add(boat.getImmatriculation()); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-06-02 11:58:03 UTC (rev 489) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-06-02 12:07:07 UTC (rev 490) @@ -460,6 +460,17 @@ Contact.BOAT, contactCsv.getBoat(), Contact.SAMPLE_ROW, contactCsv.getSampleRow()); + // Seems to have a problem with companyProperty ?!? using + // DAOLegacy (criteria) +// TopiaQuery query = dao.createQuery(). +// addEquals(TopiaEntity.TOPIA_CREATE_DATE, +// contactCsv.getTopiaCreateDate()). +// addEquals(companyProperty, contactCsv.getCompany()). +// addEquals(Contact.BOAT, contactCsv.getBoat()). +// addEquals(Contact.SAMPLE_ROW, +// contactCsv.getSampleRow()); +// Contact contact = dao.findByQuery(query); + // Check validation for existing Contact if (!updateValidation && contact != null && contact.getValidationCompany() != null) { Modified: trunk/wao-business/src/main/xmi/wao.properties =================================================================== --- trunk/wao-business/src/main/xmi/wao.properties 2010-06-02 11:58:03 UTC (rev 489) +++ trunk/wao-business/src/main/xmi/wao.properties 2010-06-02 12:07:07 UTC (rev 490) @@ -1,6 +1,9 @@ model.tagvalue.copyright=/* *##%\n Copyright (C) 2009 Wao\n *##%*/ model.tagvalue.java.lang.String=text model.tagvalue.exceptionClass=fr.ifremer.wao.WaoException + +#model.tagvalue.useLegacyDAO=true + #fr.ifremer.wao.entity.Company.attribute.waoUser.tagvalue.lazy=false #fr.ifremer.wao.entity.Company.attribute.waoUser.tagvalue.orderBy=firstName,lastName Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-06-02 11:58:03 UTC (rev 489) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2010-06-02 12:07:07 UTC (rev 490) @@ -61,7 +61,7 @@ * * @author fdesbois <fdesbois at codelutin.com> */ - at RequiresAuthentication(value = UserRole.ADMIN, readOnlyAllowed = true) + at RequiresAuthentication(value = UserRole.ADMIN, readOnlyAllowed = false) @IncludeStylesheet("context:css/administration.css") public class Administration {