Author: echatellier Date: 2014-07-28 15:30:57 +0200 (Mon, 28 Jul 2014) New Revision: 443 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/443 Log: Correction de la page de d?\195?\169verrouilage Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LockAction.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/lock-input.jsp Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LockAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LockAction.java 2014-07-28 13:23:59 UTC (rev 442) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LockAction.java 2014-07-28 13:30:57 UTC (rev 443) @@ -77,7 +77,7 @@ return SUCCESS; } - public List<MailLock> getLockedMails() { + public List<MailLock> getActiveLocks() { return activeLocks; } Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/lock-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/lock-input.jsp 2014-07-28 13:23:59 UTC (rev 442) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/lock-input.jsp 2014-07-28 13:30:57 UTC (rev 443) @@ -50,18 +50,18 @@ </tr> </thead> <tbody> - <s:iterator value="lockedMails"> + <s:iterator value="activeLocks"> <tr> - <td><input type="checkbox" name="unlockMails" value="<s:property value="topiaId" />" /> - <td><s:property value="object" /></td> - <td><s:property value="companyReference" /></td> - <td><s:property value="sender" /></td> + <td><input type="checkbox" name="mailLockIds" value="<s:property value="topiaId" />" /> + <td><s:property value="lockOn.object" /></td> + <td><s:property value="lockOn.companyReference" /></td> + <td><s:property value="lockOn.sender" /></td> <td> - <s:property value="lockedBy.firstName" /> <s:property value="lockedBy.lastName" /> + <s:property value="lockBy.firstName" /> <s:property value="lockBy.lastName" /> </td> </tr> </s:iterator> - <s:if test="lockedMails == null || lockedMails.empty"> + <s:if test="activeLocks == null || activeLocks.empty"> <tr class="emptyTable"> <td colspan="5">Aucune demande n'est actuellement verrouillée.</td> </tr>