##// END OF EJS Templates
Fixed: NOT NULL constraint error when adding a group (#4632)....
Jean-Philippe Lang -
r3229:12ea682b6639
parent child
Show More
@@ -1,43 +1,57
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2009 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 class Principal < ActiveRecord::Base
19 19 set_table_name 'users'
20 20
21 21 has_many :members, :foreign_key => 'user_id', :dependent => :destroy
22 22 has_many :memberships, :class_name => 'Member', :foreign_key => 'user_id', :include => [ :project, :roles ], :conditions => "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}", :order => "#{Project.table_name}.name"
23 23 has_many :projects, :through => :memberships
24 24
25 25 # Groups and active users
26 26 named_scope :active, :conditions => "#{Principal.table_name}.type='Group' OR (#{Principal.table_name}.type='User' AND #{Principal.table_name}.status = 1)"
27 27
28 28 named_scope :like, lambda {|q|
29 29 s = "%#{q.to_s.strip.downcase}%"
30 30 {:conditions => ["LOWER(login) LIKE :s OR LOWER(firstname) LIKE :s OR LOWER(lastname) LIKE :s OR LOWER(mail) LIKE :s", {:s => s}],
31 31 :order => 'type, login, lastname, firstname, mail'
32 32 }
33 33 }
34 34
35 before_create :set_default_empty_values
36
35 37 def <=>(principal)
36 38 if self.class.name == principal.class.name
37 39 self.to_s.downcase <=> principal.to_s.downcase
38 40 else
39 41 # groups after users
40 42 principal.class.name <=> self.class.name
41 43 end
42 44 end
45
46 protected
47
48 # Make sure we don't try to insert NULL values (see #4632)
49 def set_default_empty_values
50 self.login ||= ''
51 self.hashed_password ||= ''
52 self.firstname ||= ''
53 self.lastname ||= ''
54 self.mail ||= ''
55 true
56 end
43 57 end
General Comments 0
You need to be logged in to leave comments. Login now