Skip to content

Commit

Permalink
correction de l'affichage du flash apres un calcul et un clic sur con…
Browse files Browse the repository at this point in the history
…nexion
  • Loading branch information
nicogiard committed Aug 6, 2010
1 parent f76bf08 commit 4823d5a
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 10 deletions.
10 changes: 10 additions & 0 deletions app/controllers/Login.java
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,10 @@
package controllers;

import models.*;

public class Login extends Secure {
public static void preLogin() throws Throwable {
flash.clear();
Secure.login();
}
}
2 changes: 1 addition & 1 deletion app/views/main.html
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -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> <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} #{/if}
#{else} #{else}
<a href="@{Secure.login()}">Connexion</a> <a href="@{Login.preLogin()}">Connexion</a>
#{/else} #{/else}
</nav> </nav>
<div id="drop-fade"></div> <div id="drop-fade"></div>
Expand Down
18 changes: 9 additions & 9 deletions conf/routes
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -5,29 +5,29 @@
# Home page # Home page
GET / Application.index GET / Application.index


GET /ticket/ Application.indexTicket GET /ticket/ Application.indexTicket
GET /division/ Application.indexDivision GET /division/ Application.indexDivision


# retour accueil si get # retour accueil si get
GET /ticket/calculate Application.indexTicket GET /ticket/calculate Application.indexTicket
GET /division/calculate Application.indexDivision GET /division/calculate Application.indexDivision


GET /register Application.register GET /register Application.register
POST /register Application.saveRegister POST /register Application.saveRegister


# Les POST # Les POST
POST /ticket/calculate Application.calculateTicket POST /ticket/calculate Application.calculateTicket
POST /division/calculate Application.calculateDivision POST /division/calculate Application.calculateDivision


# Les POST pour API # Les POST pour API
POST /api/ticket/calculate Application.calculateTicketXml(format:'xml') POST /api/ticket/calculate Application.calculateTicketXml(format:'xml')
POST /api/division/calculate Application.calculateDivisionXml(format:'xml') POST /api/division/calculate Application.calculateDivisionXml(format:'xml')


# Map static resources from the /app/public folder to the /public path # Map static resources from the /app/public folder to the /public path
GET /public/ staticDir:public GET /public/ staticDir:public


# import these default routes as : # import these default routes as :
* / module:secure * / module:secure


# Catch all # Catch all
* /{controller}/{action} {controller}.{action} * /{controller}/{action} {controller}.{action}

0 comments on commit 4823d5a

Please sign in to comment.