gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-14 04:04:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugfix to pass feature test

Browse source 
- check if session[:return_to] is nil
- adds unique html ids for dropdown login fields
This commit is contained in:
Chrisbr 2014-05-10 17:52:26 +02:00
parent 0a5f08878f
commit 12e6fd9cb5
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/application_controller.rb
View file

@ -9,7 +9,8 @@ class ApplicationController < ActionController::Base
end
def after_sign_in_path_for(resource)
if not session[:return_to].start_with?(user_registration_path)
if session[:return_to] and
not session[:return_to].start_with?(user_registration_path)
logger.debug "Returning to #{session[:return_to]}"
session[:return_to]
else

4
app/views/layouts/_navigation.html.haml
View file

@ -47,8 +47,8 @@
%span.caret
.dropdown-menu{:style => "padding: 17px;"}
= form_tag user_session_path do
= text_field_tag 'user[email]'
= password_field_tag 'user[password]'
= text_field_tag 'user[email]', nil, id: 'user_email_dd'
= password_field_tag 'user[password]', nil, id: 'user_password_dd'
%label.checkbox
= check_box_tag 'user[remember_me]'
Remember me