mirror of
https://github.com/TracksApp/tracks.git
synced 2026-01-24 01:36:10 +01:00
Oops.
Didn't commit the whole tree in [191]. This commit contains all the fixes referred to in the log for [191]. git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@192 a4c988fc-2ded-0310-b66e-134b36920a42
This commit is contained in:
parent
e2487c412b
commit
aa0760f0ef
80 changed files with 501 additions and 7259 deletions
|
|
@ -20,7 +20,7 @@ class LoginController < ApplicationController
|
|||
redirect_back_or_default :controller => "todo", :action => "list"
|
||||
else
|
||||
@login = @params['user_login']
|
||||
@message = "Login unsuccessful"
|
||||
flash['warning'] = "Login unsuccessful"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -51,13 +51,13 @@ class LoginController < ApplicationController
|
|||
return
|
||||
end
|
||||
|
||||
user.is_admin = 1 if User.find_all.empty?
|
||||
user.is_admin = true if User.find_all.empty?
|
||||
if user.save
|
||||
@session['user'] = User.authenticate(user.login, @params['user']['password'])
|
||||
@user = @session['user']
|
||||
#@session['user'] = User.authenticate(user.login, @params['user']['password'])
|
||||
@user = User.authenticate(user.login, @params['user']['password'])
|
||||
@user.preferences = { "date_format" => "%d/%m/%Y", "week_starts" => "1", "no_completed" => "5", "staleness_starts" => "7", "due_style" => "1", "admin_email" => "butshesagirl@rousette.org.uk"}
|
||||
@user.save
|
||||
flash['notice'] = "Signup successful"
|
||||
flash['notice'] = "Signup successful for user #{@user.login}."
|
||||
redirect_back_or_default :controller => "todo", :action => "list"
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue