Author: bleny Date: 2011-06-27 15:29:07 +0000 (Mon, 27 Jun 2011) New Revision: 1356 Log: fix bug when selecting no user in Administration Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java trunk/wao-ui/src/main/webapp/Administration.tml Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2011-06-27 14:19:54 UTC (rev 1355) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Administration.java 2011-06-27 15:29:07 UTC (rev 1356) @@ -530,11 +530,6 @@ log.debug("User exist in selectModel : " + userId); } userEdited = findUser(userId); - if (log.isDebugEnabled()) { - log.debug(">>User : " + userEdited); - log.debug(">>User.active : " + userEdited.isActive()); - log.debug(">>User.login : " + userEdited.getLogin()); - } } } return userEdited; Modified: trunk/wao-ui/src/main/webapp/Administration.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Administration.tml 2011-06-27 14:19:54 UTC (rev 1355) +++ trunk/wao-ui/src/main/webapp/Administration.tml 2011-06-27 15:29:07 UTC (rev 1356) @@ -91,65 +91,67 @@ </div> </form> - <fieldset class="user-form clearfix"> - <t:zone t:id="userFormZone" t:update="show"> - <form t:type="beaneditform" class="clearfix" t:id="userForm" t:object="userEdited" t:model="userModel" t:zone="userFormZone"> - <t:errors /> - <p:firstName> - <label for="firstName">${message:wao.ui.field.User.firstName}</label> - <input t:type="textfield" t:id="firstName" value="userEdited.firstName" t:validate="required" /> - </p:firstName> - <p:lastName> - <label for="lastName">${message:wao.ui.field.User.lastName}</label> - <input t:type="textfield" t:id="lastName" value="userEdited.lastName" t:validate="required" /> - </p:lastName> - <p:login> - <label for="loginAdministration">${message:wao.ui.field.User.login}</label> - <input t:type="textfield" t:id="loginAdministration" value="userEdited.login" t:validate="required" /> - </p:login> - <p:password> - <label for="passwordAdministration">${message:wao.ui.form.definePasswordManually}</label> - <input t:type="passwordfield" t:id="passwordAdministration" class="width100" value="password" /> - </p:password> - <p:generatePassword> - <label for="generatePassword">${message:wao.ui.form.generatePassword}</label> - <input t:type="checkbox" t:id="generatePassword" value="generatePassword" /> - </p:generatePassword> - <p:userRole> - <t:zone id="so-admin-userRoleZone" t:id="userRoleZone" t:update="show"> - <label for="userRole">${message:wao.ui.form.roles}</label> - <div style="width: 48%; float: left;"> - <select t:type="select" t:id="userRole" t:value="role" t:model="userRoleSelectModel" - t:zone="so-admin-userRoleZone" /> - <br /> - <!--label for="readOnly">${message:wao.ui.form.readOnly} :</label--> - <span for="readOnly">${message:wao.ui.form.readOnly} :</span> - <input t:type="checkbox" t:id="readOnly" t:value="readOnly" t:mixins="ck/onEvent" t:event="change"/> - <a t:type="actionlink" t:id="addRole" title="${message:wao.ui.form.addRole}" t:zone="so-admin-userRoleZone"> - <img src="${asset:context:img/add-16px.png}" alt="${message:wao.ui.form.addRole}"/> - </a>  - </div> - <ul style="clear: both;"> - <li t:type="loop" t:source="editedUserProfiles" t:value="profile" t:index="profileIndex" t:volatile="true"> - ${profile.description} - <a t:type="actionlink" t:id="removeRole" t:context="profileIndex" title="${message:wao.ui.form.removeRole}" t:zone="so-admin-userRoleZone"> - <img src="${asset:context:img/remove-22px.png}" alt="${message:wao.ui.form.removeRole}" /> - </a> - </li> - </ul> - </t:zone> - </p:userRole> - <p:mammalsNotifications> - <t:if t:test="currentUser.obsMer"> - <t:if t:test="currentUser.admin"> - <label t:for="mammalsNotifications">${message:wao.ui.field.WaoUser.mammalsNotifications}</label> - <input t:type="checkbox" t:id="mammalsNotifications" value="userEdited.mammalsNotifications" /> + <t:zone t:id="userFormZone" t:update="show"> + <t:if test="userEdited"> + <fieldset class="user-form clearfix"> + <form t:type="beaneditform" class="clearfix" t:id="userForm" t:object="userEdited" t:model="userModel" t:zone="userFormZone"> + <t:errors /> + <p:firstName> + <label for="firstName">${message:wao.ui.field.User.firstName}</label> + <input t:type="textfield" t:id="firstName" value="userEdited.firstName" t:validate="required" /> + </p:firstName> + <p:lastName> + <label for="lastName">${message:wao.ui.field.User.lastName}</label> + <input t:type="textfield" t:id="lastName" value="userEdited.lastName" t:validate="required" /> + </p:lastName> + <p:login> + <label for="loginAdministration">${message:wao.ui.field.User.login}</label> + <input t:type="textfield" t:id="loginAdministration" value="userEdited.login" t:validate="required" /> + </p:login> + <p:password> + <label for="passwordAdministration">${message:wao.ui.form.definePasswordManually}</label> + <input t:type="passwordfield" t:id="passwordAdministration" class="width100" value="password" /> + </p:password> + <p:generatePassword> + <label for="generatePassword">${message:wao.ui.form.generatePassword}</label> + <input t:type="checkbox" t:id="generatePassword" value="generatePassword" /> + </p:generatePassword> + <p:userRole> + <t:zone id="so-admin-userRoleZone" t:id="userRoleZone" t:update="show"> + <label for="userRole">${message:wao.ui.form.roles}</label> + <div style="width: 48%; float: left;"> + <select t:type="select" t:id="userRole" t:value="role" t:model="userRoleSelectModel" + t:zone="so-admin-userRoleZone" /> + <br /> + <!--label for="readOnly">${message:wao.ui.form.readOnly} :</label--> + <span for="readOnly">${message:wao.ui.form.readOnly} :</span> + <input t:type="checkbox" t:id="readOnly" t:value="readOnly" t:mixins="ck/onEvent" t:event="change"/> + <a t:type="actionlink" t:id="addRole" title="${message:wao.ui.form.addRole}" t:zone="so-admin-userRoleZone"> + <img src="${asset:context:img/add-16px.png}" alt="${message:wao.ui.form.addRole}"/> + </a>  + </div> + <ul style="clear: both;"> + <li t:type="loop" t:source="editedUserProfiles" t:value="profile" t:index="profileIndex" t:volatile="true"> + ${profile.description} + <a t:type="actionlink" t:id="removeRole" t:context="profileIndex" title="${message:wao.ui.form.removeRole}" t:zone="so-admin-userRoleZone"> + <img src="${asset:context:img/remove-22px.png}" alt="${message:wao.ui.form.removeRole}" /> + </a> + </li> + </ul> + </t:zone> + </p:userRole> + <p:mammalsNotifications> + <t:if t:test="currentUser.obsMer"> + <t:if t:test="currentUser.admin"> + <label t:for="mammalsNotifications">${message:wao.ui.field.WaoUser.mammalsNotifications}</label> + <input t:type="checkbox" t:id="mammalsNotifications" value="userEdited.mammalsNotifications" /> + </t:if> </t:if> - </t:if> - </p:mammalsNotifications> - </form> - </t:zone> - </fieldset> + </p:mammalsNotifications> + </form> + </fieldset> + </t:if> + </t:zone> </t:if> <div class="mtop30" />