jro_apps/redmine Commit - r8626:0154d7477b53

Simplifies Principal.active scope (status defaults to 1 for groups)....

Jean-Philippe Lang -

r8626:0154d7477b53

parent child

Context file:

r8626:0154d7477b53

Collapse all files

app/models/principal.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Principal < ActiveRecord::Base
               set_table_name "#{table_name_prefix}users#{table_name_suffix}"
               has_many :members, :foreign_key => 'user_id', :dependent => :destroy
               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"
               has_many :projects, :through => :memberships
               has_many :issue_categories, :foreign_key => 'assigned_to_id', :dependent => :nullify
               # Groups and active users
-              named_scope :active, :conditions => "#{Principal.table_name}.type='Group' OR (#{Principal.table_name}.type='User' AND #{Principal.table_name}.status = 1)"
+              named_scope :active, :conditions => "#{Principal.table_name}.status = 1"
               named_scope :like, lambda {|q|
                 s = "%#{q.to_s.strip.downcase}%"
                 {:conditions => ["LOWER(login) LIKE :s OR LOWER(firstname) LIKE :s OR LOWER(lastname) LIKE :s OR LOWER(mail) LIKE :s", {:s => s}],
                  :order => 'type, login, lastname, firstname, mail'
                 }
               }
               before_create :set_default_empty_values
               def name(formatter = nil)
                 to_s
               end
               def <=>(principal)
                 if self.class.name == principal.class.name
                   self.to_s.downcase <=> principal.to_s.downcase
                 else
                   # groups after users
                   principal.class.name <=> self.class.name
                 end
               end
               protected
               # Make sure we don't try to insert NULL values (see #4632)
               def set_default_empty_values
                 self.login ||= ''
                 self.hashed_password ||= ''
                 self.firstname ||= ''
                 self.lastname ||= ''
                 self.mail ||= ''
                 true
               end
             end

test/unit/principal_test.rb +8 0

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             class PrincipalTest < ActiveSupport::TestCase
+              def test_active_scope_should_return_groups_and_active_users
+                result = Principal.active.all
+                assert_include Group.first, result
+                assert_not_nil result.detect {|p| p.is_a?(User)}
+                assert_nil result.detect {|p| p.is_a?(User) && !p.active?}
+                assert_nil result.detect {|p| p.is_a?(AnonymousUser)}
+              end
               context "#like" do
                 setup do
                   Principal.generate!(:login => 'login')
                   Principal.generate!(:login => 'login2')
                   Principal.generate!(:firstname => 'firstname')
                   Principal.generate!(:firstname => 'firstname2')
                   Principal.generate!(:lastname => 'lastname')
                   Principal.generate!(:lastname => 'lastname2')
                   Principal.generate!(:mail => 'mail@example.com')
                   Principal.generate!(:mail => 'mail2@example.com')
                 end
                 should "search login" do
                   results = Principal.like('login')
                   assert_equal 2, results.count
                   assert results.all? {|u| u.login.match(/login/) }
                 end
                 should "search firstname" do
                   results = Principal.like('firstname')
                   assert_equal 2, results.count
                   assert results.all? {|u| u.firstname.match(/firstname/) }
                 end
                 should "search lastname" do
                   results = Principal.like('lastname')
                   assert_equal 2, results.count
                   assert results.all? {|u| u.lastname.match(/lastname/) }
                 end
                 should "search mail" do
                   results = Principal.like('mail')
                   assert_equal 2, results.count
                   assert results.all? {|u| u.mail.match(/mail/) }
                 end
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages