| @@ -28,8 +28,7 class Principal < ActiveRecord::Base | |||||
| 28 | has_many :memberships, |
|
28 | has_many :memberships, | |
| 29 | lambda {preload(:project, :roles). |
|
29 | lambda {preload(:project, :roles). | |
| 30 | joins(:project). |
|
30 | joins(:project). | |
| 31 |
where("#{Project.table_name}.status<>#{Project::STATUS_ARCHIVED}") |
|
31 | where("#{Project.table_name}.status<>#{Project::STATUS_ARCHIVED}")}, | |
| 32 | order("#{Project.table_name}.name")}, |
|
|||
| 33 | :class_name => 'Member', |
|
32 | :class_name => 'Member', | |
| 34 | :foreign_key => 'user_id' |
|
33 | :foreign_key => 'user_id' | |
| 35 | has_many :projects, :through => :memberships |
|
34 | has_many :projects, :through => :memberships | |
| @@ -991,4 +991,13 class ProjectTest < ActiveSupport::TestCase | |||||
| 991 | p.status = Project::STATUS_CLOSED |
|
991 | p.status = Project::STATUS_CLOSED | |
| 992 | assert_include 'closed', p.css_classes.split |
|
992 | assert_include 'closed', p.css_classes.split | |
| 993 | end |
|
993 | end | |
|
|
994 | ||||
|
|
995 | def test_combination_of_visible_and_uniq_scopes_in_case_anonymous_group_has_memberships_should_not_error | |||
|
|
996 | project = Project.find(1) | |||
|
|
997 | member = Member.create!(:project => project, :principal => Group.anonymous, :roles => [Role.generate!]) | |||
|
|
998 | project.members << member | |||
|
|
999 | assert_nothing_raised do | |||
|
|
1000 | Project.uniq.visible.to_a | |||
|
|
1001 | end | |||
|
|
1002 | end | |||
| 994 | end |
|
1003 | end | |
General Comments 0
You need to be logged in to leave comments.
Login now