Author: bleny Date: 2014-07-15 11:37:47 +0200 (Tue, 15 Jul 2014) New Revision: 2150 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2150 Log: refs #5430 review company initialisation when creating wao user as coordinator Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java 2014-07-15 09:37:08 UTC (rev 2149) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java 2014-07-15 09:37:47 UTC (rev 2150) @@ -102,17 +102,25 @@ } - public WaoUser newWaoUser() { + public WaoUser newWaoUser(Optional<String> optionalCompanyId) { WaoUserImpl newWaoUser = new WaoUserImpl(); newWaoUser.setActive(true); + if (optionalCompanyId.isPresent()) { + + Company company = getCompanyDao().forTopiaIdEquals(optionalCompanyId.get()).findUnique(); + + newWaoUser.setCompany(company); + + } + return newWaoUser; } - public UpdateWaoUserCommand newUpdateWaoUserCommand(ObsProgram obsProgram, Optional<String> optionalUserId) { + public UpdateWaoUserCommand newUpdateWaoUserCommand(ObsProgram obsProgram, Optional<String> optionalUserId, Optional<String> optionalCompanyId) { UpdateWaoUserCommand updateWaoUserCommand = new UpdateWaoUserCommand(); @@ -144,7 +152,7 @@ } else { - updateWaoUserCommand.setWaoUser(newWaoUser()); + updateWaoUserCommand.setWaoUser(newWaoUser(optionalCompanyId)); updateWaoUserCommand.setPasswordStrategy(UpdateWaoUserCommandPasswordStrategy.GENERATE_NEW_PASSWORD); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java 2014-07-15 09:37:08 UTC (rev 2149) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java 2014-07-15 09:37:47 UTC (rev 2150) @@ -24,12 +24,10 @@ import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.base.Strings; -import com.google.common.collect.ImmutableSet; import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.services.service.administration.LoginMustBeUniqueException; import fr.ifremer.wao.services.service.administration.UnknownBoatImmatriculationsException; import fr.ifremer.wao.services.service.administration.UpdateWaoUserCommand; -import fr.ifremer.wao.services.service.administration.UpdateWaoUserCommandPasswordStrategy; import fr.ifremer.wao.services.service.administration.WaoUsersService; import fr.ifremer.wao.web.WaoJspActionSupport; import org.apache.commons.lang3.StringUtils; @@ -67,12 +65,8 @@ @Override public void prepare() { - updateWaoUserCommand = service.newUpdateWaoUserCommand(getObsProgram(), optionalWaoUserId); + updateWaoUserCommand = service.newUpdateWaoUserCommand(getObsProgram(), optionalWaoUserId, optionalCompanyId); - if (optionalCompanyId.isPresent()) { - updateWaoUserCommand.setCompanyId(optionalCompanyId.get()); - } - } @Override @@ -129,7 +123,7 @@ public UpdateWaoUserCommand getUpdateWaoUserCommand() { if (updateWaoUserCommand == null) { - return service.newUpdateWaoUserCommand(getObsProgram(), optionalWaoUserId); + prepare(); } return updateWaoUserCommand; }