Author: fdesbois Date: 2010-06-28 09:45:23 +0000 (Mon, 28 Jun 2010) New Revision: 569 Log: Ano #2357 : Rename fields for password and login on Administration page Modified: trunk/changelog.txt trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties trunk/wao-ui/src/main/webapp/Administration.tml Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2010-06-28 09:16:51 UTC (rev 568) +++ trunk/changelog.txt 2010-06-28 09:45:23 UTC (rev 569) @@ -9,6 +9,8 @@ Anomalies +++++++++ +- [fdesbois] Ano #2357 : Les champs login/password a la creation d'un utilisateur + ne sont pas vide. - [fdesbois] Ano #2356 : Problème de sauvegarde du contact sur une ligne d'échantillon vide. Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2010-06-28 09:16:51 UTC (rev 568) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2010-06-28 09:45:23 UTC (rev 569) @@ -221,8 +221,7 @@ transaction.commitTransaction(); try { - // FIXME-JC20100122 Use REGEX instead of @ to test if the login is - // a valid email + // FIXME-JC20100122 Use REGEX instead of @ to test if the login is a valid email if (user.getLogin().contains("@") && user.isPasswordChanged()) { String subject = "[WAO] "; String msg = "Bonjour,\n\n"; Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties 2010-06-28 09:16:51 UTC (rev 568) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties 2010-06-28 09:45:23 UTC (rev 569) @@ -35,10 +35,9 @@ users-label: Liste des utilisateurs firstName-label: Pr\u00e9nom* lastName-label: Nom* -login-label: Identifiant de connexion (email)* +loginAdministration-label: Identifiant de connexion (email)* active-label: Actif generatePassword-label: G\u00e9n\u00e9rer le password -password-label: ou d\u00e9finir manuellement userRole-label: R\u00f4les readOnly-label: Lecture seule # follow statement doesn't work with BeanEditForm Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2010-06-28 09:16:51 UTC (rev 568) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2010-06-28 09:45:23 UTC (rev 569) @@ -124,14 +124,14 @@ <input t:type="textfield" t:id="lastName" value="userEdited.lastName" t:validate="required" /> </p:lastName> <p:login> - <label t:type="label" for="login" /> - <input t:type="textfield" t:id="login" value="userEdited.login" t:validate="required" /> + <label t:type="label" for="loginAdministration" /> + <input t:type="textfield" t:id="loginAdministration" value="userEdited.login" t:validate="required" /> </p:login> <p:password> <label t:type="label" for="generatePassword" /> <input t:type="checkbox" t:id="generatePassword" value="generatePassword" /> <span> ou définir manuellement : </span> - <input t:type="passwordfield" t:id="password2" class="width100" value="password" /> + <input t:type="passwordfield" t:id="passwordAdministration" class="width100" value="password" /> </p:password> <p:userRole> <t:zone id="so-admin-userRoleZone" t:id="userRoleZone" t:update="show">