##// END OF EJS Templates
jro_apps » redmine
RSS
Fixed: invalid SQL query on User#destroy (#1781)....
Jean-Philippe Lang -
r1754:6fc62d393cc4
parent child
Show More
Side by Side Unified
Context file:
r1754:6fc62d393cc4 Loading diff...:
Show file before | Show file after | Hide comments
@@ -33,7 +33,8 class User < ActiveRecord::Base
33 :username => '#{login}'
33 :username => '#{login}'
34 }
34 }
35
35
36 has_many :memberships, :class_name => 'Member', :include => [ :project, :role ], :conditions => "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}", :order => "#{Project.table_name}.name", :dependent => :delete_all
36 has_many :memberships, :class_name => 'Member', :include => [ :project, :role ], :conditions => "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}", :order => "#{Project.table_name}.name"
37 has_many :members, :dependent => :delete_all
37 has_many :projects, :through => :memberships
38 has_many :projects, :through => :memberships
38 has_many :issue_categories, :foreign_key => 'assigned_to_id', :dependent => :nullify
39 has_many :issue_categories, :foreign_key => 'assigned_to_id', :dependent => :nullify
39 has_one :preference, :dependent => :destroy, :class_name => 'UserPreference'
40 has_one :preference, :dependent => :destroy, :class_name => 'UserPreference'
Show file before | Show file after | Hide comments
@@ -57,6 +57,12 class UserTest < Test::Unit::TestCase
57 assert_equal "john", @admin.login
57 assert_equal "john", @admin.login
58 end
58 end
59
59
60 def test_destroy
61 User.find(2).destroy
62 assert_nil User.find_by_id(2)
63 assert Member.find_all_by_user_id(2).empty?
64 end
65
60 def test_validate
66 def test_validate
61 @admin.login = ""
67 @admin.login = ""
62 assert !@admin.save
68 assert !@admin.save
General Comments 0
You need to be logged in to leave comments. Login now