@@ -18,7 +18,6 @@ class UsersController < ApplicationController def create @user = User.new(params[:user]) - @user.admin = true if User.count == 0 render :action => :new and return false unless @user.save if logged_in? redirect_to users_path and return true app/controllers/users_controller.rb @@ -40,6 +40,7 @@ class User < ActiveRecord::Base validates_confirmation_of :password, :on => :update, :allow_blank => true before_create :set_defaults + before_create :make_admin_if_first_user named_scope :blog_authors, :conditions => 'articles_count > 0', :order => 'articles_count desc' named_scope :chatting, lambda {|*args| {:conditions => ['chatting_at > ?', Time.now.utc-30.seconds], :order => 'login asc'}} @@ -97,6 +98,10 @@ class User < ActiveRecord::Base self.time_zone = Setting.find(:first).time_zone end + def make_admin_if_first_user + self.admin = true if User.count == 0 + end + def to_s login end app/models/user.rb @@ -1,4 +1,4 @@ -RAILS_GEM_VERSION = '2.3.3' unless defined? RAILS_GEM_VERSION +RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION require File.join(File.dirname(__FILE__), 'boot') Rails::Initializer.run do |config| config/environment.rb @@ -295,15 +295,6 @@ class UsersControllerTest < ActionController::TestCase assert_equal user.time_zone, 'US/Central' end - def test_that_first_user_created_becomes_admin_and_others_dont - User.delete_all - post :create, :user => {:login => 'user1', :email => 'test1@test.com', :password => 'abc', :password_confirmation => 'abc'} - post :create, :user => {:login => 'user2', :email => 'test2@test.com', :password => 'abc', :password_confirmation => 'abc'} - assert_equal User.count, 2 - assert_equal User.find_by_login('user1').admin, true - assert_equal User.find_by_login('user2').admin, false - end - def test_that_user_gets_default_time_values post :create, :user => {:login => 'user1', :email => 'test1@test.com', :password => 'abc', :password_confirmation => 'abc'} assert_not_nil User.find_by_login('user1').online_at test/functional/users_controller_test.rb @@ -23,6 +23,14 @@ class UserTest < ActiveSupport::TestCase assert u.valid? end + def test_that_first_user_created_becomes_admin_and_others_dont + User.delete_all + u1 = User.make + u2 = User.make + assert_equal true, u1.admin? + assert_equal false, u2.admin? + end + def test_blog_authors users(:trevor).articles.create(:title => 'test', :body => 'test') authors = User.blog_authors test/unit/user_test.rb eac99d4b3cdd95782c3bc8e0642c7e3b0380017a Trevor Turk trevorturk@gmail.com http://github.com/trevorturk/eldorado/commit/e8719c211925b5c538d26b37b8c7aaa5053208ab e8719c211925b5c538d26b37b8c7aaa5053208ab 2009-09-11T08:35:56-07:00 2009-09-11T08:35:56-07:00 update to rails 2.3.4, move initial admin creation to user model instead of controller dd480769388a5d721bb5b9e285e629f8c9782612 Trevor Turk trevorturk@gmail.com