From a3b41a222497c0a420e11e73c7c75a70a150328f Mon Sep 17 00:00:00 2001 From: Andrei Malyshev Date: Sun, 8 Nov 2015 23:32:14 +0300 Subject: Remove ordering memberships of principal by project name to be able using visible scope after uniq for projects --- app/models/principal.rb | 3 +-- test/unit/project_test.rb | 8 ++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/models/principal.rb b/app/models/principal.rb index c7addd9..f3c8835 100644 --- a/app/models/principal.rb +++ b/app/models/principal.rb @@ -28,8 +28,7 @@ class Principal < ActiveRecord::Base has_many :memberships, lambda {preload(:project, :roles). joins(:project). - where("#{Project.table_name}.status<>#{Project::STATUS_ARCHIVED}"). - order("#{Project.table_name}.name")}, + where("#{Project.table_name}.status<>#{Project::STATUS_ARCHIVED}")}, :class_name => 'Member', :foreign_key => 'user_id' has_many :projects, :through => :memberships diff --git a/test/unit/project_test.rb b/test/unit/project_test.rb index ffb514a..108e32c 100644 --- a/test/unit/project_test.rb +++ b/test/unit/project_test.rb @@ -991,4 +991,12 @@ class ProjectTest < ActiveSupport::TestCase p.status = Project::STATUS_CLOSED assert_include 'closed', p.css_classes.split end + + def test_combination_of_visible_and_uniq_scopes_in_case_anonymous_group_has_memberships + project = projects(:projects_001) + user = Group.find(13) + member = Member.create!(:project => project, :principal => user, :roles => [Role.generate!]) + project.members << member + Project.uniq.visible + end end -- 2.4.9 (Apple Git-60)