| @@ -32,7 +32,6 class Journal < ActiveRecord::Base | |||||
| 32 | :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.issue.id, :anchor => "change-#{o.id}"}} |
|
32 | :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.issue.id, :anchor => "change-#{o.id}"}} | |
| 33 |
|
33 | |||
| 34 | acts_as_activity_provider :type => 'issues', |
|
34 | acts_as_activity_provider :type => 'issues', | |
| 35 | :permission => :view_issues, |
|
|||
| 36 | :author_key => :user_id, |
|
35 | :author_key => :user_id, | |
| 37 | :find_options => {:include => [{:issue => :project}, :details, :user], |
|
36 | :find_options => {:include => [{:issue => :project}, :details, :user], | |
| 38 | :conditions => "#{Journal.table_name}.journalized_type = 'Issue' AND" + |
|
37 | :conditions => "#{Journal.table_name}.journalized_type = 'Issue' AND" + | |
| @@ -27,3 +27,10 journals_004: | |||||
| 27 | journalized_type: Issue |
|
27 | journalized_type: Issue | |
| 28 | user_id: 1 |
|
28 | user_id: 1 | |
| 29 | journalized_id: 6 |
|
29 | journalized_id: 6 | |
|
|
30 | journals_005: | |||
|
|
31 | id: 5 | |||
|
|
32 | created_on: <%= 1.days.ago.to_date.to_s(:db) %> | |||
|
|
33 | notes: "A comment on a private issue." | |||
|
|
34 | user_id: 2 | |||
|
|
35 | journalized_type: Issue | |||
|
|
36 | journalized_id: 14 | |||
| @@ -52,6 +52,9 class ActivityTest < ActiveSupport::TestCase | |||||
| 52 | assert events.include?(Message.find(5)) |
|
52 | assert events.include?(Message.find(5)) | |
| 53 | # Issue of a private project |
|
53 | # Issue of a private project | |
| 54 | assert !events.include?(Issue.find(4)) |
|
54 | assert !events.include?(Issue.find(4)) | |
|
|
55 | # Private issue and comment | |||
|
|
56 | assert !events.include?(Issue.find(14)) | |||
|
|
57 | assert !events.include?(Journal.find(5)) | |||
| 55 | end |
|
58 | end | |
| 56 |
|
59 | |||
| 57 | def test_global_activity_logged_user |
|
60 | def test_global_activity_logged_user | |
General Comments 0
You need to be logged in to leave comments.
Login now