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: 23 inserted, 12 deleted

app/controllers/main_controller.rb ¶ +14 -6

               class MainController < ApplicationController
                 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]
                 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
+            +   # 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]
                   end
                   @site_select = []
                   @countries.each do |country|
                     country.sites.each do |site|
                       @site_select << ["#{site.name}, #{country.name}", site.id]

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

                     else
                       render :action => 'email_error', :layout => 'empty'
                     end
                   else
                     @user.errors.add_to_base("Email cannot be blank") if @user.email==''
                     render :action => 'new', :layout => 'empty'
                   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
                   end
                   render :action => 'confirm', :layout => 'empty'
                 end
                 protected

app/models/user.rb ¶ +1

                   def self.encrypt(string,salt)
                     Digest::SHA1.hexdigest(salt + string)
                   end
                   def uniqueness_of_email_from_activated_users
                     user = User.activated_users.find_by_email(self.email)
                     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
                   end
               end

app/views/main/login.html.haml ¶ +2 -1

               %h1= Configuration['ui.front.title']
               - if @announcements.length!=0
                 .announcementbox
                   %span{:class => 'title'}
                     Announcements
                   = render :partial => 'announcement', :collection => @announcements
               %b= Configuration['ui.front.welcome_message']
               %br/
+            +
+            + - if !@hidelogin
                 Please login to see the problem list.
                 %br/
                 %br/
                 - if flash[:notice]
                   %hr/
                   %b= flash[:notice]
                   %hr/
                 %div{ :style => "border: solid 1px gray; padding: 2px; background: #f0f0f0;"}
                   - form_tag :controller => 'login', :action => 'login' do
                     %table
                       %tr
                         %td{:align => "right"} Login:
                         %td= text_field_tag 'login'
                       %tr
                         %td{:align => "right"} Password:
                         %td= password_field_tag
                     = submit_tag 'Login'
               %br/
               - if Configuration['system.online_registration']
                 Want to participate?
                 %b
                   Please
                   = link_to 'register.', :controller => :users, :action => :new
                 %br/
               - if (Configuration['system.mode']=='contest') and (Configuration['contest.multisites'])
                 %script{:type => 'text/javascript'}
                   var siteList = new Array();

spec/controllers/users_controller_spec.rb ¶ +1

                   post :register, :login => @john_info[:login],
                                   :full_name => @john_info[:full_name],
                                   :email => @john_info[:email]
                   response.should render_template('users/email_error')
                 end
                 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
                   response.should render_template('users/confirm')
                 end
               end

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: 23 inserted, 12 deleted

Sign in to your account

Commit r160:0138848b0c5b public

Author

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

Commit `r160:0138848b0c5b` public