jro_apps/redmine Commit - r8992:92dde0d75f33

Merged r8863 from trunk....

Jean-Philippe Lang -

r8992:92dde0d75f33

parent child

Context file:

r8992:92dde0d75f33

Collapse all files

app/models/member.rb +11 -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 Member < ActiveRecord::Base
               belongs_to :user
               belongs_to :principal, :foreign_key => 'user_id'
               has_many :member_roles, :dependent => :destroy
               has_many :roles, :through => :member_roles
               belongs_to :project
               validates_presence_of :principal, :project
               validates_uniqueness_of :user_id, :scope => :project_id
               after_destroy :unwatch_from_permission_change
               def name
                 self.user.name
               end
               alias :base_role_ids= :role_ids=
               def role_ids=(arg)
                 ids = (arg || []).collect(&:to_i) - [0]
                 # Keep inherited roles
                 ids += member_roles.select {|mr| !mr.inherited_from.nil?}.collect(&:role_id)
                 new_role_ids = ids - role_ids
                 # Add new roles
                 new_role_ids.each {|id| member_roles << MemberRole.new(:role_id => id) }
                 # Remove roles (Rails' #role_ids= will not trigger MemberRole#on_destroy)
                 member_roles_to_destroy = member_roles.select {|mr| !ids.include?(mr.role_id)}
                 if member_roles_to_destroy.any?
                   member_roles_to_destroy.each(&:destroy)
                   unwatch_from_permission_change
                 end
               end
               def <=>(member)
                 a, b = roles.sort.first, member.roles.sort.first
-                a == b ? (principal <=> member.principal) : (a <=> b)
+                if a == b
+                  if principal
+                    principal <=> member.principal
+                  else
+                  end
+                elsif a
+                  a <=> b
+                else
+                end
               end
               def deletable?
                 member_roles.detect {|mr| mr.inherited_from}.nil?
               end
               def include?(user)
                 if principal.is_a?(Group)
                   !user.nil? && user.groups.include?(principal)
                 else
                   self.user == user
                 end
               end
               def before_destroy
                 if user
                   # remove category based auto assignments for this member
                   IssueCategory.update_all "assigned_to_id = NULL", ["project_id = ? AND assigned_to_id = ?", project.id, user.id]
                 end
               end
               # Find or initilize a Member with an id, attributes, and for a Principal
               def self.edit_membership(id, new_attributes, principal=nil)
                 @membership = id.present? ? Member.find(id) : Member.new(:principal => principal)
                 @membership.attributes = new_attributes
                 @membership
               end
               protected
               def validate
                 errors.add_on_empty :role if member_roles.empty? && roles.empty?
               end
               private
               # Unwatch things that the user is no longer allowed to view inside project
               def unwatch_from_permission_change
                 if user
                   Watcher.prune(:user => user, :project => project)
                 end
               end
             end

app/models/principal.rb +3 -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 :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
+                if principal.nil?
+                  -1
+                elsif 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/member_test.rb +17 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 MemberTest < ActiveSupport::TestCase
               fixtures :projects, :trackers, :issue_statuses, :issues,
                        :enumerations, :users, :issue_categories,
                        :projects_trackers,
                        :roles,
                        :member_roles,
                        :members,
                        :enabled_modules,
                        :workflows,
                        :groups_users,
                        :watchers,
                        :journals, :journal_details,
                        :messages,
                        :wikis, :wiki_pages, :wiki_contents, :wiki_content_versions,
                        :boards
               def setup
                 @jsmith = Member.find(1)
               end
               def test_create
                 member = Member.new(:project_id => 1, :user_id => 4, :role_ids => [1, 2])
                 assert member.save
                 member.reload
                 assert_equal 2, member.roles.size
                 assert_equal Role.find(1), member.roles.sort.first
               end
               def test_update
                 assert_equal "eCookbook", @jsmith.project.name
                 assert_equal "Manager", @jsmith.roles.first.name
                 assert_equal "jsmith", @jsmith.user.login
                 @jsmith.mail_notification = !@jsmith.mail_notification
                 assert @jsmith.save
               end
               def test_update_roles
                 assert_equal 1, @jsmith.roles.size
                 @jsmith.role_ids = [1, 2]
                 assert @jsmith.save
                 assert_equal 2, @jsmith.reload.roles.size
               end
               def test_validate
                 member = Member.new(:project_id => 1, :user_id => 2, :role_ids => [2])
                 # same use can't have more than one membership for a project
                 assert !member.save
                 member = Member.new(:project_id => 1, :user_id => 2, :role_ids => [])
                 # must have one role at least
                 assert !member.save
               end
               def test_destroy
                 assert_difference 'Member.count', -1 do
                   assert_difference 'MemberRole.count', -1 do
                     @jsmith.destroy
                   end
                 end
                 assert_raise(ActiveRecord::RecordNotFound) { Member.find(@jsmith.id) }
               end
+              def test_sort_without_roles
+                a = Member.new(:roles => [Role.first])
+                b = Member.new
+                assert_equal -1, a <=> b
+                assert_equal 1,  b <=> a
+              end
+              def test_sort_without_principal
+                role = Role.first
+                a = Member.new(:roles => [role], :principal => User.first)
+                b = Member.new(:roles => [role])
+                assert_equal -1, a <=> b
+                assert_equal 1,  b <=> a
+              end
               context "removing permissions" do
                 setup do
                   Watcher.delete_all("user_id = 9")
                   user = User.find(9)
                   # public
                   Watcher.create!(:watchable => Issue.find(1), :user => user)
                   # private
                   Watcher.create!(:watchable => Issue.find(4), :user => user)
                   Watcher.create!(:watchable => Message.find(7), :user => user)
                   Watcher.create!(:watchable => Wiki.find(2), :user => user)
                   Watcher.create!(:watchable => WikiPage.find(3), :user => user)
                 end
                 context "of user" do
                   setup do
                     @member = Member.create!(:project => Project.find(2), :principal => User.find(9), :role_ids => [1, 2])
                   end
                   context "by deleting membership" do
                     should "prune watchers" do
                       assert_difference 'Watcher.count', -4 do
                         @member.destroy
                       end
                     end
                   end
                   context "by updating roles" do
                     should "prune watchers" do
                       Role.find(2).remove_permission! :view_wiki_pages
                       member = Member.first(:order => 'id desc')
                       assert_difference 'Watcher.count', -2 do
                         member.role_ids = [2]
                         member.save
                       end
                       assert !Message.find(7).watched_by?(@user)
                     end
                   end
                 end
                 context "of group" do
                   setup do
                     group = Group.find(10)
                     @member = Member.create!(:project => Project.find(2), :principal => group, :role_ids => [1, 2])
                     group.users << User.find(9)
                   end
                   context "by deleting membership" do
                     should "prune watchers" do
                       assert_difference 'Watcher.count', -4 do
                         @member.destroy
                       end
                     end
                   end
                   context "by updating roles" do
                     should "prune watchers" do
                       Role.find(2).remove_permission! :view_wiki_pages
                       assert_difference 'Watcher.count', -2 do
                         @member.role_ids = [2]
                         @member.save
                       end
                     end
                   end
                 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