cafe-grader-web Commit - r160:0138848b0c5b

cafe-grader-web

Commit `r160:0138848b0c5b` public

parent | child

Description:

fixed user confirmation bug git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@305 6386c4cd-e34a-4fa8-8920-d93eb39b512e

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r160:0138848b0c5b - Thu, 11 Dec 2008 04:05:51 - 5 files changed: 42 inserted, 31 deleted

app/controllers/main_controller.rb ¶ +16 -8

                 SYSTEM_MODE_CONF_KEY = 'system.mode'
                 before_filter :authenticate, :except => [:index, :login]
                 before_filter :check_viewability, :except => [:index, :login]
-            - #
+            +   # COMMENTED OUT: filter in each action instead
-            - #  COMMENT OUT: filter in each action instead
+            +   # before_filter :verify_time_limit, :only => [:submit]
-            - #
-            - #  before_filter :verify_time_limit, :only => [:submit]
                 verify :method => :post, :only => [:submit],
                        :redirect_to => { :action => :index }
-            - #  COMMENT OUT, only need when having high load
+            +   # COMMENT OUT: only need when having high load
-            - #  caches_action :index, :login
+            +   # caches_action :index, :login
+            +   # NOTE: This method is not actually needed, 'config/routes.rb' has
+            +   # assigned action login as a default action.
                 def index
                   redirect_to :action => 'login'
                 end
                 def login
                   saved_notice = flash[:notice]
                   reset_session
                   flash[:notice] = saved_notice
+            +     # EXPERIMENT:
+            +     # Hide login if in single user mode and the url does not
+            +     # explicitly specify /login
                   #
-            -     # These are for site administrator login
+            +     # logger.info "PATH: #{request.path}"
-            -     #
+            +     # if Configuration['system.single_user_mode'] and
+            +     #     request.path!='/main/login'
+            +     #   @hidelogin = true
+            +     # end
+            +
+            +     # Site administrator login
                   @countries = Country.find(:all, :include => :sites)
                   @country_select = @countries.collect { |c| [c.name, c.id] }
                   @country_select_with_all = [['Any',0]]
                   @countries.each do |country|
                     @country_select_with_all << [country.name, country.id]

app/controllers/users_controller.rb ¶ +5 -5

                   end
                 end
                 def confirm
                   login = params[:login]
                   key = params[:activation]
-            -     user = User.find_by_login(login)
+            +     @user = User.find_by_login(login)
-            -     if (user) and (user.verify_activation_key(key))
+            +     if (@user) and (@user.verify_activation_key(key))
-            -       if user.valid?  # check uniquenss of email
+            +       if @user.valid?  # check uniquenss of email
-            -         user.activated = true
+            +         @user.activated = true
-            -         user.save
+            +         @user.save
                       @result = :successful
                     else
                       @result = :email_used
                     end
                   else
                     @result = :failed

app/models/user.rb ¶ +1

                     if user and (user.login != self.login)
                       self.errors.add_to_base("Email has already been taken")
                     end
                   end
                   def enough_time_interval_between_same_email_registrations
+            +       return if !self.new_record?
                     open_user = User.find_by_email(self.email,
                                                    :order => 'created_at DESC')
                     if open_user and open_user.created_at and
                         (open_user.created_at > Time.now.gmtime - 5.minutes)
                       self.errors.add_to_base("There are already unactivated registrations with this e-mail address (please wait for 5 minutes)")
                     end

app/views/main/login.html.haml ¶ +19 -18

@@ -5,32 +5,33
5	%span{:class => 'title'}	5	%span{:class => 'title'}
6	Announcements	6	Announcements
7	= render :partial => 'announcement', :collection => @announcements	7	= render :partial => 'announcement', :collection => @announcements
8		8
9	%b= Configuration['ui.front.welcome_message']	9	%b= Configuration['ui.front.welcome_message']
10	%br/	10	%br/
11	- Please login to see the problem list.
12	- %br/
13	- %br/
14		11
15	- - if flash[:notice]	12	+ - if !@hidelogin
16	- %hr/	13	+ Please login to see the problem list.
17	- %b= flash[:notice]	14	+ %br/
18	- %hr/	15	+ %br/
		16	+
		17	+ - if flash[:notice]
		18	+ %hr/
		19	+ %b= flash[:notice]
		20	+ %hr/
19		21
20	- %div{ :style => "border: solid 1px gray; padding: 2px; background: #f0f0f0;"}	22	+ %div{ :style => "border: solid 1px gray; padding: 2px; background: #f0f0f0;"}
21	- - form_tag :controller => 'login', :action => 'login' do	23	+ - form_tag :controller => 'login', :action => 'login' do
22	- %table	24	+ %table
23	- %tr	25	+ %tr
24	- %td{:align => "right"} Login:	26	+ %td{:align => "right"} Login:
25	- %td= text_field_tag 'login'	27	+ %td= text_field_tag 'login'
26	- %tr	28	+ %tr
27	- %td{:align => "right"} Password:	29	+ %td{:align => "right"} Password:
28	- %td= password_field_tag	30	+ %td= password_field_tag
29	- = submit_tag 'Login'	31	+ = submit_tag 'Login'
30	-
31	%br/	32	%br/
32		33
33	- if Configuration['system.online_registration']	34	- if Configuration['system.online_registration']
34	Want to participate?	35	Want to participate?
35	%b	36	%b
36	Please	37	Please

spec/controllers/users_controller_spec.rb ¶ +1

                 it "should activate user with valid activation key" do
                   login = @john_info[:login]
                   User.should_receive(:find_by_login).
                     with(login).
                     and_return(@john)
+            +     User.should_not_receive(:find_by_email)
                   @john.should_receive(:valid?).and_return(true)
                   @john.should_receive(:activated=).with(true)
                   @john.should_receive(:save).and_return(true)
                   get :confirm, :login => login, :activation => @john_activation_key

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r160:0138848b0c5b - Thu, 11 Dec 2008 04:05:51 - 5 files changed: 42 inserted, 31 deleted

Sign in to your account

Commit r160:0138848b0c5b public

Author

r160:0138848b0c5b - Thu, 11 Dec 2008 04:05:51 - 5 files changed: 42 inserted, 31 deleted

Commit `r160:0138848b0c5b` public