diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-08-25 11:55:40 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-08-25 11:55:40 +0000 |
| commit | 6fc62d393cc49986408aa4ef22ddb5f8eb7b34e2 (patch) | |
| tree | cf0c809338fbec07ff13575a452842fc3c0febe0 /app | |
| parent | 5ef0af67101e66e09119230d374eafee660a1632 (diff) | |
| download | redmine-6fc62d393cc49986408aa4ef22ddb5f8eb7b34e2.tar.gz redmine-6fc62d393cc49986408aa4ef22ddb5f8eb7b34e2.zip | |
Fixed: invalid SQL query on User#destroy (#1781).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1755 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/user.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index cabce3005..05a75e1ad 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -33,7 +33,8 @@ class User < ActiveRecord::Base :username => '#{login}' } - 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 + has_many :memberships, :class_name => 'Member', :include => [ :project, :role ], :conditions => "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}", :order => "#{Project.table_name}.name" + has_many :members, :dependent => :delete_all has_many :projects, :through => :memberships has_many :issue_categories, :foreign_key => 'assigned_to_id', :dependent => :nullify has_one :preference, :dependent => :destroy, :class_name => 'UserPreference' |