[Suiviobsmer-commits] r359 - in trunk: wao-business wao-business/src/main/resources/oldmappings/WaoModel wao-business/src/main/resources/oldmappings/WaoModel/1.0 wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity wao-ui wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/web

Author: fdesbois Date: 2010-02-16 20:25:14 +0000 (Tue, 16 Feb 2010) New Revision: 359 Added: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/CompanyImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ContactImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/NewsImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml Modified: trunk/wao-business/pom.xml trunk/wao-ui/pom.xml trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java trunk/wao-ui/src/main/webapp/js/wao.js Log: - Resolve issue on comment save - Change scm from refactoring module names - Add new mapping for 1.0 version Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2010-02-16 18:27:00 UTC (rev 358) +++ trunk/wao-business/pom.xml 2010-02-16 20:25:14 UTC (rev 359) @@ -160,9 +160,9 @@ </build> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/suiviobsmer-business/?root=suiviobsmer</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/suiviobsmer-business</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/suiviobsmer-business</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-business/?root=suiviobsmer</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-business</developerConnection> </scm> </project> Added: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityCalendarImpl.hbm.xml 2010-02-16 20:25:14 UTC (rev 359) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.ActivityCalendarImpl" table="activityCalendar" node="fr.ifremer.wao.entity.ActivityCalendarImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityCalendar" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="year" type="int" access="field" column="year" node="year"/> + <property name="fiability" type="int" access="field" column="fiability" node="fiability"/> + <bag name="activityMonth" inverse="true" order-by="month" lazy="true" cascade="all,delete-orphan" node="activityMonth" embed-xml="false"> + <key column="activityCalendar"/> + <one-to-many class="fr.ifremer.wao.entity.ActivityMonthImpl" node="topiaId" embed-xml="false"/> + </bag> + <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" node="boat/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityMonthImpl.hbm.xml 2010-02-16 20:25:14 UTC (rev 359) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.ActivityMonthImpl" table="activityMonth" node="fr.ifremer.wao.entity.ActivityMonthImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityMonth" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="harbourLibelle" type="text" access="field" column="harbourLibelle" node="harbourLibelle"/> + <property name="active" type="boolean" access="field" column="active" node="active"/> + <property name="nbBoardingPersons" type="java.lang.Integer" access="field" column="nbBoardingPersons" node="nbBoardingPersons"/> + <property name="nbSeaDays" type="java.lang.Integer" access="field" column="nbSeaDays" node="nbSeaDays"/> + <property name="nbFishingDays" type="java.lang.Integer" access="field" column="nbFishingDays" node="nbFishingDays"/> + <property name="month" type="int" access="field" column="month" node="month"/> + <property name="harbourCode" type="text" access="field" column="harbourCode" node="harbourCode"/> + <property name="harbourId" type="int" access="field" column="harbourId" node="harbourId"/> + <bag name="activityProfession" inverse="true" order-by="professionOrder" lazy="true" cascade="all,delete-orphan" node="activityProfession" embed-xml="false"> + <key column="activityMonth"/> + <one-to-many class="fr.ifremer.wao.entity.ActivityProfessionImpl" node="topiaId" embed-xml="false"/> + </bag> + <many-to-one name="activityCalendar" class="fr.ifremer.wao.entity.ActivityCalendarImpl" column="activityCalendar" node="activityCalendar/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityProfessionImpl.hbm.xml 2010-02-16 20:25:14 UTC (rev 359) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.ActivityProfessionImpl" table="activityProfession" node="fr.ifremer.wao.entity.ActivityProfessionImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityProfession" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="code" type="text" access="field" column="code" node="code"/> + <property name="libelle" type="text" access="field" column="libelle" node="libelle"/> + <property name="id" type="int" access="field" column="id" node="id"/> + <property name="professionOrder" type="int" access="field" column="professionOrder" node="professionOrder"/> + <many-to-one name="activityMonth" class="fr.ifremer.wao.entity.ActivityMonthImpl" column="activityMonth" node="activityMonth/@topiaId" embed-xml="false"/> + <bag name="activityZone" inverse="true" order-by="zoneId" lazy="true" cascade="all,delete-orphan" node="activityZone" embed-xml="false"> + <key column="activityProfession"/> + <one-to-many class="fr.ifremer.wao.entity.ActivityZoneImpl" node="topiaId" embed-xml="false"/> + </bag> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ActivityZoneImpl.hbm.xml 2010-02-16 20:25:14 UTC (rev 359) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.ActivityZoneImpl" table="activityZone" node="fr.ifremer.wao.entity.ActivityZoneImpl" abstract="false" proxy="fr.ifremer.wao.entity.ActivityZone" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="zoneCode" type="text" access="field" column="zoneCode" node="zoneCode"/> + <property name="zoneLibelle" type="text" access="field" column="zoneLibelle" node="zoneLibelle"/> + <property name="zoneId" type="int" access="field" column="zoneId" node="zoneId"/> + <property name="gradiantCode" type="int" access="field" column="gradiantCode" node="gradiantCode"/> + <property name="gradiantLibelle" type="text" access="field" column="gradiantLibelle" node="gradiantLibelle"/> + <many-to-one name="activityProfession" class="fr.ifremer.wao.entity.ActivityProfessionImpl" column="activityProfession" node="activityProfession/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatImpl.hbm.xml 2010-02-16 20:25:14 UTC (rev 359) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.BoatImpl" table="boat" node="fr.ifremer.wao.entity.BoatImpl" abstract="false" proxy="fr.ifremer.wao.entity.Boat" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="immatriculation" type="int" access="field" column="immatriculation" node="immatriculation" index="boat_immatriculation_idx" unique="true"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="districtCode" type="text" access="field" column="districtCode" node="districtCode"/> + <property name="boatLength" type="int" access="field" column="boatLength" node="boatLength"/> + <property name="buildYear" type="int" access="field" column="buildYear" node="buildYear"/> + <property name="active" type="boolean" access="field" column="active" node="active"/> + <many-to-one name="shipOwner" class="fr.ifremer.wao.entity.ShipOwnerImpl" column="shipOwner" lazy="false" node="shipOwner/@topiaId" embed-xml="false"/> + <bag name="companyBoatInfos" inverse="true" lazy="true" cascade="all,delete-orphan" node="companyBoatInfos" embed-xml="false"> + <key column="boat"/> + <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" node="topiaId" embed-xml="false"/> + </bag> + <bag name="activityCalendar" inverse="true" lazy="true" cascade="all,delete-orphan" node="activityCalendar" embed-xml="false"> + <key column="boat"/> + <one-to-many class="fr.ifremer.wao.entity.ActivityCalendarImpl" node="topiaId" embed-xml="false"/> + </bag> + <bag name="elligibleBoat" inverse="true" order-by="companyActive" lazy="true" node="elligibleBoat" embed-xml="false"> + <key column="boat"/> + <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" node="topiaId" embed-xml="false"/> + </bag> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/BoatInfosImpl.hbm.xml 2010-02-16 20:25:14 UTC (rev 359) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.BoatInfosImpl" table="boatInfos" node="fr.ifremer.wao.entity.BoatInfosImpl" abstract="false" proxy="fr.ifremer.wao.entity.BoatInfos" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="contactFirstName" type="text" access="field" column="contactFirstName" node="contactFirstName"/> + <property name="contactLastName" type="text" access="field" column="contactLastName" node="contactLastName"/> + <property name="contactEmail" type="text" access="field" column="contactEmail" node="contactEmail"/> + <property name="contactPhoneNumber" type="text" access="field" column="contactPhoneNumber" node="contactPhoneNumber"/> + <property name="dup" type="java.lang.Integer" access="field" column="dup" node="dup"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" node="company/@topiaId" embed-xml="false" /> + <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" node="boat/@topiaId" embed-xml="false" /> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/CompanyImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/CompanyImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/CompanyImpl.hbm.xml 2010-02-16 20:25:14 UTC (rev 359) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.CompanyImpl" table="company" node="fr.ifremer.wao.entity.CompanyImpl" abstract="false" proxy="fr.ifremer.wao.entity.Company" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="phoneNumber" type="text" access="field" column="phoneNumber" node="phoneNumber"/> + <property name="address1" type="text" access="field" column="address1" node="address1"/> + <property name="address2" type="text" access="field" column="address2" node="address2"/> + <property name="active" type="boolean" access="field" column="active" node="active"/> + <property name="email" type="text" access="field" column="email" node="email"/> + <property name="city" type="text" access="field" column="city" node="city"/> + <property name="postalCode" type="int" access="field" column="postalCode" node="postalCode"/> + <bag name="waoUser" inverse="true" lazy="false" cascade="all,delete-orphan" node="waoUser" embed-xml="false"> + <key column="company"/> + <one-to-many class="fr.ifremer.wao.entity.WaoUserImpl" node="topiaId" embed-xml="false"/> + </bag> + <bag name="boatBoatInfos" inverse="true" lazy="true" cascade="all,delete-orphan" node="boatBoatInfos" embed-xml="false"> + <key column="company"/> + <one-to-many class="fr.ifremer.wao.entity.BoatInfosImpl" node="topiaId" embed-xml="false"/> + </bag> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ContactImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ContactImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ContactImpl.hbm.xml 2010-02-16 20:25:14 UTC (rev 359) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.ContactImpl" table="contact" node="fr.ifremer.wao.entity.ContactImpl" abstract="false" proxy="fr.ifremer.wao.entity.Contact" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="tideBeginDate" type="java.util.Date" access="field" column="tideBeginDate" node="tideBeginDate"/> + <property name="tideEndDate" type="java.util.Date" access="field" column="tideEndDate" node="tideEndDate"/> + <property name="nbObservants" type="int" access="field" column="nbObservants" node="nbObservants"/> + <property name="mammalsObservation" type="boolean" access="field" column="mammalsObservation" node="mammalsObservation"/> + <property name="mammalsCapture" type="boolean" access="field" column="mammalsCapture" node="mammalsCapture"/> + <property name="validationProgram" type="java.lang.Boolean" access="field" column="validationProgram" node="validationProgram"/> + <property name="validationCompany" type="java.lang.Boolean" access="field" column="validationCompany" node="validationCompany"/> + <property name="dataInputDate" type="java.util.Date" access="field" column="dataInputDate" node="dataInputDate"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <property name="state" type="text" access="field" column="state" node="state"/> + <property name="tideNbDays" type="int" access="field" column="tideNbDays" node="tideNbDays"/> + <many-to-one name="observer" class="fr.ifremer.wao.entity.WaoUserImpl" column="observer" node="observer/@topiaId" embed-xml="false"/> + <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" lazy="false" node="sampleRow/@topiaId" embed-xml="false"/> + <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" lazy="false" node="boat/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ElligibleBoatImpl.hbm.xml 2010-02-16 20:25:14 UTC (rev 359) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.ElligibleBoatImpl" table="elligibleBoat" node="fr.ifremer.wao.entity.ElligibleBoatImpl" abstract="false" proxy="fr.ifremer.wao.entity.ElligibleBoat" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="globalActive" type="boolean" access="field" column="globalActive" node="globalActive"/> + <property name="companyActive" type="java.lang.Boolean" access="field" column="companyActive" node="companyActive"/> + <many-to-one name="boat" class="fr.ifremer.wao.entity.BoatImpl" column="boat" lazy="false" node="boat/@topiaId" embed-xml="false"/> + <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/FishingZoneImpl.hbm.xml 2010-02-16 20:25:14 UTC (rev 359) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.FishingZoneImpl" table="fishingZone" node="fr.ifremer.wao.entity.FishingZoneImpl" abstract="false" proxy="fr.ifremer.wao.entity.FishingZone" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="sectorName" type="text" access="field" column="sectorName" node="sectorName"/> + <property name="facadeName" type="text" access="field" column="facadeName" node="facadeName"/> + <property name="districtCode" type="text" access="field" column="districtCode" node="districtCode"/> + <bag name="sampleRow" table="fishingzone_samplerow" lazy="true" node="sampleRow" embed-xml="true"> + <key column="fishingZone"/> + <many-to-many class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" order-by="code" node="topiaId"/> + </bag> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/NewsImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/NewsImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/NewsImpl.hbm.xml 2010-02-16 20:25:14 UTC (rev 359) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.NewsImpl" table="news" node="fr.ifremer.wao.entity.NewsImpl" abstract="false" proxy="fr.ifremer.wao.entity.News" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="title" type="text" access="field" column="title" node="title"/> + <property name="content" type="text" access="field" column="content" node="content"/> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ProfessionImpl.hbm.xml 2010-02-16 20:25:14 UTC (rev 359) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.ProfessionImpl" table="profession" node="fr.ifremer.wao.entity.ProfessionImpl" abstract="false" proxy="fr.ifremer.wao.entity.Profession" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="codeDCF5" type="text" access="field" column="codeDCF5" node="codeDCF5"/> + <property name="meshSize" type="text" access="field" column="meshSize" node="meshSize"/> + <property name="size" type="text" access="field" column="size" node="size"/> + <property name="other" type="text" access="field" column="other" node="other"/> + <property name="libelle" type="text" access="field" column="libelle" node="libelle"/> + <property name="species" type="text" access="field" column="species" node="species"/> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleMonthImpl.hbm.xml 2010-02-16 20:25:14 UTC (rev 359) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.SampleMonthImpl" table="sampleMonth" node="fr.ifremer.wao.entity.SampleMonthImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleMonth" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="realTidesValue" type="int" access="field" column="realTidesValue" node="realTidesValue"/> + <property name="expectedTidesValue" type="int" access="field" column="expectedTidesValue" node="expectedTidesValue"/> + <property name="periodDate" type="java.util.Date" access="field" column="periodDate" node="periodDate"/> + <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowImpl.hbm.xml 2010-02-16 20:25:14 UTC (rev 359) @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.SampleRowImpl" table="sampleRow" node="fr.ifremer.wao.entity.SampleRowImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleRow" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="nbObservants" type="int" access="field" column="nbObservants" node="nbObservants"/> + <property name="averageTideTime" type="double" access="field" column="averageTideTime" node="averageTideTime"/> + <property name="code" type="text" access="field" column="code" node="code" index="sampleRow_code_idx" unique="true"/> + <property name="fishingZonesInfos" type="text" access="field" column="fishingZonesInfos" node="fishingZonesInfos"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <property name="programName" type="text" access="field" column="programName" node="programName"/> + <property name="periodBegin" type="java.util.Date" access="field" column="periodBegin" node="periodBegin"/> + <property name="periodEnd" type="java.util.Date" access="field" column="periodEnd" node="periodEnd"/> + <many-to-one name="profession" class="fr.ifremer.wao.entity.ProfessionImpl" column="profession" lazy="false" node="profession/@topiaId" embed-xml="false"/> + <bag name="sampleMonth" inverse="true" order-by="periodDate" lazy="false" cascade="all,delete-orphan" node="sampleMonth" embed-xml="false"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.wao.entity.SampleMonthImpl" node="topiaId" embed-xml="false"/> + </bag> + <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" lazy="false" node="company/@topiaId" embed-xml="false"/> + <bag name="sampleRowLog" inverse="true" order-by="topiaCreateDate desc" lazy="false" cascade="all,delete-orphan" node="sampleRowLog" embed-xml="false"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.wao.entity.SampleRowLogImpl" node="topiaId" embed-xml="false"/> + </bag> + <bag name="elligibleBoat" inverse="true" order-by="companyActive" lazy="false" cascade="all,delete-orphan" node="elligibleBoat" embed-xml="false"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.wao.entity.ElligibleBoatImpl" node="topiaId" embed-xml="false"/> + </bag> + <bag name="fishingZone" table="fishingzone_samplerow" inverse="true" lazy="false" node="fishingZone" embed-xml="true"> + <key column="sampleRow"/> + <many-to-many class="fr.ifremer.wao.entity.FishingZoneImpl" column="fishingZone" order-by="facadeName,sectorName,districtCode" node="topiaId"/> + </bag> + <bag name="contact" inverse="true" lazy="true" node="contact" embed-xml="false"> + <key column="sampleRow"/> + <one-to-many class="fr.ifremer.wao.entity.ContactImpl" node="topiaId" embed-xml="false"/> + </bag> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/SampleRowLogImpl.hbm.xml 2010-02-16 20:25:14 UTC (rev 359) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.SampleRowLogImpl" table="sampleRowLog" node="fr.ifremer.wao.entity.SampleRowLogImpl" abstract="false" proxy="fr.ifremer.wao.entity.SampleRowLog" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="logText" type="text" access="field" column="logText" node="logText"/> + <property name="comment" type="text" access="field" column="comment" node="comment"/> + <many-to-one name="sampleRow" class="fr.ifremer.wao.entity.SampleRowImpl" column="sampleRow" node="sampleRow/@topiaId" embed-xml="false"/> + <many-to-one name="admin" class="fr.ifremer.wao.entity.WaoUserImpl" column="admin" lazy="false" node="admin/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/ShipOwnerImpl.hbm.xml 2010-02-16 20:25:14 UTC (rev 359) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.ShipOwnerImpl" table="shipOwner" node="fr.ifremer.wao.entity.ShipOwnerImpl" abstract="false" proxy="fr.ifremer.wao.entity.ShipOwner" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="code" type="text" access="field" column="code" node="code" index="shipOwner_code_idx" unique="true"/> + <property name="firstName" type="text" access="field" column="firstName" node="firstName"/> + <property name="lastName" type="text" access="field" column="lastName" node="lastName"/> + </class> +</hibernate-mapping> Added: trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml =================================================================== --- trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml (rev 0) +++ trunk/wao-business/src/main/resources/oldmappings/WaoModel/1.0/fr/ifremer/wao/entity/WaoUserImpl.hbm.xml 2010-02-16 20:25:14 UTC (rev 359) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="fr.ifremer.wao.entity"> + <class name="fr.ifremer.wao.entity.WaoUserImpl" table="waoUser" node="fr.ifremer.wao.entity.WaoUserImpl" abstract="false" proxy="fr.ifremer.wao.entity.WaoUser" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="timestamp" node="@topiaCreateDate"/> + <property name="firstName" type="text" access="field" column="firstName" node="firstName"/> + <property name="lastName" type="text" access="field" column="lastName" node="lastName"/> + <property name="phoneNumber" type="text" access="field" column="phoneNumber" node="phoneNumber"/> + <property name="login" type="text" access="field" column="login" node="login"/> + <property name="password" type="text" access="field" column="password" node="password"/> + <property name="active" type="boolean" access="field" column="active" node="active"/> + <property name="admin" type="boolean" access="field" column="admin" node="admin"/> + <many-to-one name="company" class="fr.ifremer.wao.entity.CompanyImpl" column="company" node="company/@topiaId" embed-xml="false"/> + <bag name="contact" inverse="true" lazy="true" node="contact" embed-xml="false"> + <key column="observer"/> + <one-to-many class="fr.ifremer.wao.entity.ContactImpl" node="topiaId" embed-xml="false"/> + </bag> + </class> +</hibernate-mapping> Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2010-02-16 18:27:00 UTC (rev 358) +++ trunk/wao-ui/pom.xml 2010-02-16 20:25:14 UTC (rev 359) @@ -141,9 +141,9 @@ </repositories> <scm> - <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/suiviobsmer-ui/?root=suiviobsmer</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/suiviobsmer-ui</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/suiviobsmer-ui</developerConnection> + <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/wao-ui/?root=suiviobsmer</url> + <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</connection> + <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/wao-ui</developerConnection> </scm> </project> Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-02-16 18:27:00 UTC (rev 358) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-02-16 20:25:14 UTC (rev 359) @@ -388,16 +388,6 @@ @Persist private String oldComment; - public void prepareContactEdited(String contactId) throws WaoException { -// if (getContacts().contains(contactId)) { - // The contacts list result must contains this contactId because - // only actions from the page can access to the complete contacts - // list of the same page. - contactEdited = getContacts().get(contactId); -// } - //contact = contactEdited; - } - public boolean hasActions() { return !user.getAdmin() && contact.getValidationCompany() == null; } @@ -424,11 +414,10 @@ } void onSelectedFromAcceptContact(String contactId) throws WaoException { - //contact = getContacts().get(contactId); if (log.isDebugEnabled()) { log.debug("Accept contact : " + contactId); } - prepareContactEdited(contactId); + contactEdited = getContacts().get(contactId); if (user.getAdmin()) { contactEdited.setValidationProgram(Boolean.TRUE); } else { @@ -439,11 +428,10 @@ } void onSelectedFromRefuseContact(String contactId) throws WaoException { - //contact = getContacts().get(contactId); if (log.isDebugEnabled()) { log.debug("Refuse contact : " + contactId); } - prepareContactEdited(contactId); + contactEdited = getContacts().get(contactId); if (user.getAdmin()) { // For program refused, removeRealTideTime contactEdited.getSampleRow().removeRealTideTime(contactEdited); @@ -454,11 +442,10 @@ } void onSelectedFromUnvalidateContact(String contactId) throws WaoException { - //contact = getContacts().get(contactId); if (log.isDebugEnabled()) { log.debug("Unvalidate contact : " + contactId); } - prepareContactEdited(contactId); + contactEdited = getContacts().get(contactId); if (user.getAdmin()) { // For program unvalidate from previous refused validation, addRealTideTime if (BooleanUtils.isFalse(contactEdited.getValidationProgram())) { @@ -476,11 +463,10 @@ } void onSelectedFromEditContact(String contactId) throws WaoException { - //contact = getContacts().get(contactId); if (log.isDebugEnabled()) { log.debug("Edit contact : " + contactId); } - prepareContactEdited(contactId); + contactEdited = getContacts().get(contactId); //prepareContactEdited(contactId); contactUserId = contactEdited.getObserver().getTopiaId(); //contactEditedId = contactId; contactSelectedId = contactId; @@ -489,20 +475,18 @@ } void onSelectedFromDeleteContact(String contactId) throws WaoException { - //contact = getContacts().get(contactId); if (log.isDebugEnabled()) { log.debug("Delete contact : " + contactId); } - prepareContactEdited(contactId); + contactEdited = getContacts().get(contactId); deleted = true; } void onSelectedFromSaveContact(String contactId) throws WaoException { - //contact = getContacts().get(contactId); if (log.isDebugEnabled()) { log.debug("Save contact : " + contactId); } - prepareContactEdited(contactId); + // ContactEdited is in session, previously set by Edit action contactEdited.setState(contactState.toString()); WaoUser contactUser = getUserSelectModel().findObject(contactUserId); contactEdited.setObserver(contactUser); @@ -517,15 +501,6 @@ edited = true; } -// @Log -// void onSelectedFromSaveComment(String contactId) throws WaoException { -// contact = getContacts().get(contactId); -// if (log.isInfoEnabled()) { -// log.info("Comment : " + contact.getComment()); -// } -// contactEdited = true; -// } - /**************************** CONTACT SAVE ********************************/ @Persist(PersistenceConstants.FLASH) @@ -646,7 +621,6 @@ // The contact is not saved, the contact must be editable to show form // and correct errors edited = true; - //contactEditedId = contact.getTopiaId(); return contactsForm; //return gridZone; } Modified: trunk/wao-ui/src/main/webapp/js/wao.js =================================================================== --- trunk/wao-ui/src/main/webapp/js/wao.js 2010-02-16 18:27:00 UTC (rev 358) +++ trunk/wao-ui/src/main/webapp/js/wao.js 2010-02-16 20:25:14 UTC (rev 359) @@ -14,7 +14,7 @@ var oldValue = hidden.getValue(); var newValue = $F(commentPopupId); var img = $(imgId); - if (!newValue || (unfinishedState && oldValue == newValue)) { + if ((unfinishedState && !newValue) || (unfinishedState && oldValue == newValue)) { img.setAttribute('src', context + '/img/comment-invalid-22px.png'); img.setAttribute('title', 'Le commentaire est obligatoire pour un échec'); } else if (oldValue != newValue) {