Author: bleny Date: 2011-04-11 14:49:00 +0000 (Mon, 11 Apr 2011) New Revision: 1175 Log: fix mandatory filtering on company for contact 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-04-11 13:29:13 UTC (rev 1174) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-04-11 14:49:00 UTC (rev 1175) @@ -1521,6 +1521,11 @@ initialFromDate.set(Calendar.DAY_OF_YEAR, 1); } + // DO NOT REMOVE THIS + if (connectedUser.isCoordinatorOrObserver()) { + contactFilter.setCompany(connectedUser.getUser().getCompany()); + } + contactFilter.setFromDate(initialFromDate.getTime()); contactFilter.setObsProgram(connectedUser.getProfile().getObsProgram()); contactFilter.setEstimatedTides(true);