Author: echatellier Date: 2014-07-08 16:10:53 +0200 (Tue, 08 Jul 2014) New Revision: 363 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/363 Log: refs #5354: Label des verrous 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-08 14:10:47 UTC (rev 362) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LockAction.java 2014-07-08 14:10:53 UTC (rev 363) @@ -75,7 +75,9 @@ @Override @Action(results = {@Result(type = "redirectAction", params = {"actionName", "lock-input"})}) public String execute() throws Exception { - emailService.unlockMails(unlockMails); + if (unlockMails != null) { + emailService.unlockMails(unlockMails); + } return SUCCESS; } 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-08 14:10:47 UTC (rev 362) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/lock-input.jsp 2014-07-08 14:10:53 UTC (rev 363) @@ -27,7 +27,7 @@ <html> <head> - <title>Vérrouillages</title> + <title>Verrouillages</title> <link rel="stylesheet" type="text/css" href="<s:url value='/nuiton-js/faxtomail-lock.css' />" /> </head> @@ -43,8 +43,10 @@ <thead> <tr> <th></th> - <th>Demande</th> - <th>Vérrouillé par</th> + <th>Objet</th> + <th>Notre référence</th> + <th>Émetteur</th> + <th>Verrouillé par</th> </tr> </thead> <tbody> @@ -52,6 +54,8 @@ <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> <s:property value="lockedBy.firstName" /> <s:property value="lockedBy.lastName" /> </td> @@ -59,7 +63,7 @@ </s:iterator> <s:if test="lockedMails == null || lockedMails.empty"> <tr class="emptyTable"> - <td colspan="3">Aucune demande n'est actuellement vérrouillée.</td> + <td colspan="5">Aucune demande n'est actuellement verrouillée.</td> </tr> </s:if> </tbody> @@ -67,7 +71,7 @@ <nav class="navbar navbar-default navbar-fixed-bottom"> <div class="container"> - <button type="submit" class="btn btn-primary navbar-btn pull-right">Valider</button> + <button type="submit" class="btn btn-primary navbar-btn pull-right">Supprimer les verrous</button> </div> </nav> </s:form>
participants (1)
-
echatellier@users.forge.codelutin.com