cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix two issues with the remember_me_openid button

Browse source 
1. It didn't work, the code only checked the remember_me button, not
   the remember_me_openid button.

2. It did not have a unique id, making the label next to it not work
   for selecting the checkbox.
This commit is contained in:
Thijs Alkemade 2015-02-01 10:33:01 +00:00 • committed by Tom Hughes
parent d423ae9137
commit 17f926fefb
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/user_controller.rb
View file

@ -276,12 +276,13 @@ class UserController < ApplicationController
def login def login
if params[:username] or using_open_id? if params[:username] or using_open_id?
session[:remember_me] ||= params[:remember_me]
session[:referer] ||= params[:referer] session[:referer] ||= params[:referer]
if using_open_id? if using_open_id?
session[:remember_me] ||= params[:remember_me_openid]
openid_authentication(params[:openid_url]) openid_authentication(params[:openid_url])
else else
session[:remember_me] ||= params[:remember_me]
password_authentication(params[:username], params[:password]) password_authentication(params[:username], params[:password])
end end
end end

2
app/views/user/login.html.erb
View file

@ -54,7 +54,7 @@
<span class="minorNote">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</span> <span class="minorNote">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</span>
</div> </div>
<div id="remember_me_openid" class='form-row'> <div class='form-row'>
<%= check_box_tag "remember_me_openid", "yes", false, :tabindex => 5 %> <%= check_box_tag "remember_me_openid", "yes", false, :tabindex => 5 %>
<label class="standard-label" for="remember_me_openid"><%= t 'user.login.remember' %></label> <label class="standard-label" for="remember_me_openid"><%= t 'user.login.remember' %></label>
</div> </div>