Author: bleny Date: 2011-02-03 15:56:17 +0000 (Thu, 03 Feb 2011) New Revision: 980 Log: bugfix : obsVente admin can't validate contact due to data Reliability Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 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 2011-02-03 15:36:41 UTC (rev 979) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-02-03 15:56:17 UTC (rev 980) @@ -486,23 +486,24 @@ } } - if (success && BooleanUtils.isTrue(contact.isValidationProgram())) { + if (success && contact.getObsProgram() == ObsProgram.OBSMER) { // this check is only for ObsMer + if (BooleanUtils.isTrue(contact.isValidationProgram())) { + // it's an admin validation, data-reliability field must be filled + if (log.isDebugEnabled()) { + log.debug("field data reliability is " + contact.getDataReliability()); + } - // it's an admin validation, data-reliability field must be filled - if (log.isDebugEnabled()) { - log.debug("field data reliability is " + contact.getDataReliability()); + if (contact.getDataReliability() == null || + contact.getDataReliability() == DataReliability.UNKNOWN) { + success = false; + message = "Il faut préciser la qualité des données avant de valider"; + } else if (contact.getDataReliability() != DataReliability.RELIABLE + && StringUtils.isEmpty(contact.getCommentAdmin())) { + success = false; + message = WaoUtils.translate(n_("wao.business.contact.validation.commentAdminNecessaryForDataReliability"), + contact.getContactState().toString()); + } } - - if (contact.getDataReliability() == null || - contact.getDataReliability() == DataReliability.UNKNOWN) { - success = false; - message = "Il faut préciser la qualité des données avant de valider"; - } else if (contact.getDataReliability() != DataReliability.RELIABLE - && StringUtils.isEmpty(contact.getCommentAdmin())) { - success = false; - message = WaoUtils.translate(n_("wao.business.contact.validation.commentAdminNecessaryForDataReliability"), - contact.getContactState().toString()); - } } ValidationResult result = new ValidationResultImpl();