@@ -5,12 +5,12 | |||
|
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. |
@@ -25,14 +25,14 class Principal < ActiveRecord::Base | |||
|
25 | 25 | |
|
26 | 26 | # Groups and active users |
|
27 | 27 | named_scope :active, :conditions => "#{Principal.table_name}.type='Group' OR (#{Principal.table_name}.type='User' AND #{Principal.table_name}.status = 1)" |
|
28 | ||
|
29 |
named_scope :like, lambda {|q| |
|
|
28 | ||
|
29 | named_scope :like, lambda {|q| | |
|
30 | 30 | s = "%#{q.to_s.strip.downcase}%" |
|
31 | 31 | {:conditions => ["LOWER(login) LIKE :s OR LOWER(firstname) LIKE :s OR LOWER(lastname) LIKE :s OR LOWER(mail) LIKE :s", {:s => s}], |
|
32 | 32 | :order => 'type, login, lastname, firstname, mail' |
|
33 | 33 | } |
|
34 | 34 | } |
|
35 | ||
|
35 | ||
|
36 | 36 | before_create :set_default_empty_values |
|
37 | 37 | |
|
38 | 38 | def name(formatter = nil) |
@@ -47,9 +47,9 class Principal < ActiveRecord::Base | |||
|
47 | 47 | principal.class.name <=> self.class.name |
|
48 | 48 | end |
|
49 | 49 | end |
|
50 | ||
|
50 | ||
|
51 | 51 | protected |
|
52 | ||
|
52 | ||
|
53 | 53 | # Make sure we don't try to insert NULL values (see #4632) |
|
54 | 54 | def set_default_empty_values |
|
55 | 55 | self.login ||= '' |
General Comments 0
You need to be logged in to leave comments.
Login now