DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

[Fix #468] fix demo login

Browse source
This commit is contained in:
Mathieu Magnin 2017-06-20 14:39:56 +02:00
parent 58350f219a
commit e51d8965a2
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/administrateurs/sessions_controller.rb
View file

@ -1,4 +1,6 @@
class Administrateurs::SessionsController < Sessions::SessionsController class Administrateurs::SessionsController < Sessions::SessionsController
layout "new_application"
def demo def demo
return redirect_to root_path if Rails.env.production? return redirect_to root_path if Rails.env.production?

2
app/controllers/gestionnaires/sessions_controller.rb
View file

@ -1,4 +1,6 @@
class Gestionnaires::SessionsController < Sessions::SessionsController class Gestionnaires::SessionsController < Sessions::SessionsController
layout "new_application"
def demo def demo
return redirect_to root_path if Rails.env.production? return redirect_to root_path if Rails.env.production?

8
app/views/users/sessions/new.html.haml
View file

@ -31,8 +31,10 @@
= f.label :password, "Mot de passe" = f.label :password, "Mot de passe"
= f.password_field :password, value: @user.password, placeholder: "8 caractères minimum" = f.password_field :password, value: @user.password, placeholder: "8 caractères minimum"
.reset-password.text-right
= link_to "Mot de passe oublié ?", new_password_path(resource_name), class: "link" - if [:user, :gestionnaire].include?(resource_name)
.reset-password.text-right
= link_to "Mot de passe oublié ?", new_password_path(resource_name), class: "link"
- if devise_mapping.rememberable? - if devise_mapping.rememberable?
= f.check_box :remember_me, as: :boolean = f.check_box :remember_me, as: :boolean
@ -50,7 +52,7 @@
.center .center
= link_to "Qu’est-ce que FranceConnect ?", "https://franceconnect.gouv.fr/", target: "_blank", class: "link" = link_to "Qu’est-ce que FranceConnect ?", "https://franceconnect.gouv.fr/", target: "_blank", class: "link"
- if devise_mapping.registerable? - if resource_name == :user
%hr %hr
%p.register %p.register
%span %span