@@ -16,8 +16,8 @@ class PeopleController < ApplicationController def show @person = Person.find(params[:id], :include => :activities) - if @person.deactivated? and not current_person.admin? - flash[:error] = "That person is not activated" + unless @person.active? or current_person.admin? + flash[:error] = "That person is not active" redirect_to home_url and return end if logged_in? app/controllers/people_controller.rb @@ -13,7 +13,8 @@ class SessionsController < ApplicationController if person.deactivated? flash[:error] = "Your account has been deactivated" redirect_to home_url and return - elsif global_prefs.email_verifications? and not person.email_verified? + elsif global_prefs.email_verifications? and + not person.email_verified? and not person.admin? flash[:notice] = %(Unverified email address. Please check your email for your activation code.) redirect_to login_url and return app/controllers/sessions_controller.rb @@ -1,6 +1,14 @@ class AddEmailVerified < ActiveRecord::Migration def self.up add_column :people, :email_verified, :boolean, :default => nil + if Preference.find(:first).email_verifications? + # This is to modify the database for the splitting between + # 'deactivated' and 'email_verified'. + Person.find(:all).each do |person| + person.email_verified = !person.deactivated? + person.save + end + end rescue nil end def self.down db/migrate/023_add_email_verified.rb @@ -48,7 +48,16 @@ describe PeopleController do @person.toggle!(:deactivated) get :show, :id => @person response.should redirect_to(home_url) - flash[:error].should =~ /not activated/ + flash[:error].should =~ /not active/ + end + + it "should redirect to home for email unverified users" do + enable_email_notifications + @person.email_verified = false; @person.save! + @person.should_not be_active + get :show, :id => @person + response.should redirect_to(home_url) + flash[:error].should =~ /not active/ end end spec/controllers/people_controller_spec.rb 983283f3dc62c08424cc26aaf133c4402797346c Michael Hartl michael@michaelhartl.com http://github.com/valodzka/insoshi/commit/b2442c9a907ba387eaf6374367979b048293b88a b2442c9a907ba387eaf6374367979b048293b88a 2008-05-21T11:50:03-07:00 2008-05-21T11:50:03-07:00 Last of the polish on email_verified 1399e52f21ceed89052ae6b3e1ef409343454d04 Michael Hartl michael@michaelhartl.com