Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-31 22:38:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix cucumber scenario's.

Browse source 
One still fails on Cookie overflow, but works testing by hand...
This commit is contained in:
Reinier Balt 2013-05-13 17:13:26 +02:00
parent 7465ecce26
commit 8ffacca393
6 changed files with 11 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/projects_controller.rb
View file

@ -61,8 +61,8 @@ class ProjectsController < ApplicationController
def review
@source_view = params['_source_view'] || 'review'
@page_title = t('projects.list_reviews')
@projects = current_user.projects.all
@contexts = current_user.contexts.all
@projects = current_user.projects.load
@contexts = current_user.contexts.load
@projects_to_review = current_user.projects.select {|p| p.needs_review?(current_user)}
@stalled_projects = current_user.projects.select {|p| p.stalled?}
@blocked_projects = current_user.projects.select {|p| p.blocked?}

15
app/controllers/users_controller.rb
View file

@ -68,6 +68,7 @@ class UsersController < ApplicationController
render_failure "Expected post format is valid xml like so: <user><login>username</login><password>abc123</password></user>."
return
end
respond_to do |format|
format.html do
unless User.no_users_yet? || (@user && @user.is_admin?) || SITE_CONFIG['open_signups']
@ -79,20 +80,6 @@ class UsersController < ApplicationController
user = User.new(params['user'])
if Tracks::Config.auth_schemes.include?('ldap') &&
user.auth_type == 'ldap' &&
!SimpleLdapAuthenticator.valid?(user.login, params['user']['password'])
notify :warning, "Incorrect password"
redirect_to signup_path
return
end
if Tracks::Config.auth_schemes.include?('cas')
if user.auth_type.eql? "cas"
user.crypted_password = "cas"
end
end
unless user.valid?
session['new_user'] = user
redirect_to signup_path