From echatellier@users.forge.codelutin.com Tue Jul 8 16:10:54 2014
From: echatellier@users.forge.codelutin.com
To: faxtomail-commits@list.forge.codelutin.com
Subject: [Faxtomail-commits] r363 - in trunk/faxtomail-ui-web/src/main:
java/com/franciaflex/faxtomail/web/action/admin webapp/WEB-INF/content/admin
Date: Tue, 08 Jul 2014 16:10:54 +0200
Message-ID: <20140708141054.7E70318108A@goh.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4951350728121747470=="
--===============4951350728121747470==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 =3D {@Result(type =3D "redirectAction", params =3D {"act=
ionName", "lock-input"})})
public String execute() throws Exception {
- emailService.unlockMails(unlockMails);
+ if (unlockMails !=3D null) {
+ emailService.unlockMails(unlockMails);
+ }
return SUCCESS;
}
=20
Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/lock-i=
nput.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/lock-input.j=
sp 2014-07-08 14:10:47 UTC (rev 362)
+++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/lock-input.j=
sp 2014-07-08 14:10:53 UTC (rev 363)
@@ -27,7 +27,7 @@
=20
- V=C3=A9rrouillages
+ Verrouillages
" />
=20
@@ -43,8 +43,10 @@
|
- Demande |
- V=C3=A9rrouill=C3=A9 par |
+ Objet |
+ Notre r=C3=A9f=C3=A9rence |
+ =C3=89metteur |
+ Verrouill=C3=A9 par |
@@ -52,6 +54,8 @@
| " />
| |
+ |
+ |
|
@@ -59,7 +63,7 @@
- | Aucune demande n'est actuellement v=C3=A9r=
rouill=C3=A9e. |
+ Aucune demande n'est actuellement verrouil=
l=C3=A9e. |
@@ -67,7 +71,7 @@
=20
--===============4951350728121747470==--