Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

…nexion
  • Loading branch information...
commit 4823d5a85bc649c4fae232f3f0ab96a07196d0d4 1 parent f76bf08
Nicolas Giard authored August 06, 2010
10  app/controllers/Login.java
... ...
@@ -0,0 +1,10 @@
  1
+package controllers;
  2
+
  3
+import models.*;
  4
+
  5
+public class Login extends Secure {
  6
+	public static void preLogin() throws Throwable {
  7
+		flash.clear();
  8
+		Secure.login();
  9
+	}
  10
+}
2  app/views/main.html
@@ -28,7 +28,7 @@
28 28
 		<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>
29 29
 		#{/if}
30 30
 		#{else}
31  
-		<a href="@{Secure.login()}">Connexion</a>
  31
+		<a href="@{Login.preLogin()}">Connexion</a>
32 32
 		#{/else}
33 33
 	</nav>
34 34
 	<div id="drop-fade"></div>
18  conf/routes
@@ -5,29 +5,29 @@
5 5
 # Home page
6 6
 GET     /                                       Application.index
7 7
 
8  
-GET     /ticket/			                    Application.indexTicket
9  
-GET     /division/			                    Application.indexDivision
  8
+GET     /ticket/			        Application.indexTicket
  9
+GET     /division/			        Application.indexDivision
10 10
 
11 11
 # retour accueil si get
12 12
 GET     /ticket/calculate                       Application.indexTicket
13 13
 GET     /division/calculate                     Application.indexDivision
14 14
 
15  
-GET		/register								Application.register
16  
-POST	/register								Application.saveRegister
  15
+GET	/register				Application.register
  16
+POST	/register				Application.saveRegister
17 17
 
18 18
 # Les POST
19  
-POST	/ticket/calculate						Application.calculateTicket
20  
-POST	/division/calculate						Application.calculateDivision
  19
+POST	/ticket/calculate			Application.calculateTicket
  20
+POST	/division/calculate			Application.calculateDivision
21 21
 
22 22
 # Les POST pour API
23  
-POST 	/api/ticket/calculate					Application.calculateTicketXml(format:'xml')
24  
-POST 	/api/division/calculate					Application.calculateDivisionXml(format:'xml')
  23
+POST 	/api/ticket/calculate			Application.calculateTicketXml(format:'xml')
  24
+POST 	/api/division/calculate			Application.calculateDivisionXml(format:'xml')
25 25
 
26 26
 # Map static resources from the /app/public folder to the /public path
27 27
 GET     /public/                                staticDir:public
28 28
 
29 29
 # import these default routes as :
30  
-*		/               						module:secure
  30
+*	/               			module:secure
31 31
 
32 32
 # Catch all
33 33
 *       /{controller}/{action}                  {controller}.{action}

0 notes on commit 4823d5a

Please sign in to comment.
Something went wrong with that request. Please try again.