Permalink
Browse files

correction de l'affichage du flash apres un calcul et un clic sur con…

…nexion
  • Loading branch information...
nicogiard committed Aug 6, 2010
1 parent f76bf08 commit 4823d5a85bc649c4fae232f3f0ab96a07196d0d4
Showing with 20 additions and 10 deletions.
  1. +10 −0 app/controllers/Login.java
  2. +1 −1 app/views/main.html
  3. +9 −9 conf/routes
View
@@ -0,0 +1,10 @@
+package controllers;
+
+import models.*;
+
+public class Login extends Secure {
+ public static void preLogin() throws Throwable {
+ flash.clear();
+ Secure.login();
+ }
+}
View
@@ -28,7 +28,7 @@
<a href="@{Secure.logout()}" class="right"><img src="@{'/public/images/logout.png'}" id="logout-icon" alt="Se d&eacute;connecter" title="Se d&eacute;connecter"></a>
#{/if}
#{else}
- <a href="@{Secure.login()}">Connexion</a>
+ <a href="@{Login.preLogin()}">Connexion</a>
#{/else}
</nav>
<div id="drop-fade"></div>
View
@@ -5,29 +5,29 @@
# Home page
GET / Application.index
-GET /ticket/ Application.indexTicket
-GET /division/ Application.indexDivision
+GET /ticket/ Application.indexTicket
+GET /division/ Application.indexDivision
# retour accueil si get
GET /ticket/calculate Application.indexTicket
GET /division/calculate Application.indexDivision
-GET /register Application.register
-POST /register Application.saveRegister
+GET /register Application.register
+POST /register Application.saveRegister
# Les POST
-POST /ticket/calculate Application.calculateTicket
-POST /division/calculate Application.calculateDivision
+POST /ticket/calculate Application.calculateTicket
+POST /division/calculate Application.calculateDivision
# Les POST pour API
-POST /api/ticket/calculate Application.calculateTicketXml(format:'xml')
-POST /api/division/calculate Application.calculateDivisionXml(format:'xml')
+POST /api/ticket/calculate Application.calculateTicketXml(format:'xml')
+POST /api/division/calculate Application.calculateDivisionXml(format:'xml')
# Map static resources from the /app/public folder to the /public path
GET /public/ staticDir:public
# import these default routes as :
-* / module:secure
+* / module:secure
# Catch all
* /{controller}/{action} {controller}.{action}

0 comments on commit 4823d5a

Please sign in to comment.