Author: bleny Date: 2011-04-06 14:33:43 +0000 (Wed, 06 Apr 2011) New Revision: 1146 Log: fix user asked to send email if contact is newly imported from CSV in ObsDeb Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2011-04-06 14:33:04 UTC (rev 1145) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2011-04-06 14:33:43 UTC (rev 1146) @@ -145,7 +145,8 @@ protected void addSendEmailScript() { // Ask user to send an email if not already sent - if ( ! getContact().getEmailSent()) { + if ( ObsProgram.OBSMER == getContact().getObsProgram() // mail is only for ObsMer + && ! getContact().getEmailSent()) { String confirmMessage = "Souhaitez vous envoyer un email de demande d\\'ajout " + @@ -167,9 +168,6 @@ @Persist private String contactId; -// @Persist -// private Contact oldContact; - @Persist private Contact contact;