Author: fdesbois Date: 2010-03-10 17:03:05 +0000 (Wed, 10 Mar 2010) New Revision: 370 Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java Log: Ano #2185 : problem with create new contact from boat infos Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2010-03-01 22:11:34 UTC (rev 369) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2010-03-10 17:03:05 UTC (rev 370) @@ -807,6 +807,13 @@ sampleRow = getSampleRow(); // Get boat from list boat = getBoats().get(boatImmatriculation); + if (log.isDebugEnabled()) { + log.debug("Create contact from BOAT list"); + log.debug("Create contact :: boat imma : " + + boat.getImmatriculation()); + log.debug("Create contact :: sampleRow code : " + + sampleRow.getCode()); + } contacts.createNewContact(boat, sampleRow); return contacts; } @@ -815,6 +822,13 @@ // Get sampleRow from elligibleBoat list ElligibleBoat elligible = getCompanyBoatInfos().getElligibleBoat(sampleRowCode); sampleRow = elligible.getSampleRow(); + if (log.isDebugEnabled()) { + log.debug("Create contact from BOAT infos"); + log.debug("Create contact :: boat imma : " + + getBoatSelected()); + log.debug("Create contact :: sampleRow code : " + + sampleRow.getCode()); + } contacts.createNewContact(getBoatSelected(), sampleRow); return contacts; } 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-03-01 22:11:34 UTC (rev 369) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-03-10 17:03:05 UTC (rev 370) @@ -627,7 +627,13 @@ public void createNewContact(Boat boat, SampleRow sampleRow) throws WaoException { contact = serviceContact.getNewContact(user, sampleRow, boat); - serviceContact.saveContact(contact, Boolean.FALSE); - contactSelectedId = contact.getTopiaId(); + // Check boat not null and validation for create the new contact + if (boat != null && boat.canCreateContact(user.getCompany())) { + serviceContact.saveContact(contact, Boolean.FALSE); + contactSelectedId = contact.getTopiaId(); + } else { + layout.getFeedBack(). + addError("Un contact en cours existe déjà pour ce navire"); + } } }