Author: bleny Date: 2014-08-06 14:52:31 +0200 (Wed, 06 Aug 2014) New Revision: 2201 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2201 Log: fixes #5492 add validation to force presence of login Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java =================================================================== --- branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java 2014-08-06 12:41:53 UTC (rev 2200) +++ branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java 2014-08-06 12:52:31 UTC (rev 2201) @@ -89,12 +89,12 @@ if ( ! updateWaoUserCommand.getClearPassword().equals(updateWaoUserCommand.getClearPasswordConfirmation())) { addFieldError("updateWaoUserCommand.clearPasswordConfirmation", t("wao.ui.form.updateWaoUserCommand.passwordMismatch")); } - } else if (updateWaoUserCommand.getPasswordStrategy().isGeneratePassword()) { - if ( ! StringUtil.isEmail(updateWaoUserCommand.getWaoUser().getLogin())) { - addFieldError("updateWaoUserCommand.waoUser.login", t("wao.ui.form.updateWaoUserCommand.loginMustBeEmail")); - } } + if ( ! StringUtil.isEmail(updateWaoUserCommand.getWaoUser().getLogin())) { + addFieldError("updateWaoUserCommand.waoUser.login", t("wao.ui.form.updateWaoUserCommand.loginMustBeEmail")); + } + if (updateWaoUserCommand.getCompanyId() == null) { addFieldError("updateWaoUserCommand.companyId", t("wao.ui.form.updateWaoUserCommand.requiredCompany")); }