meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Fixed that journals are shown multiple times in activity (#19168).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@14163 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2015-04-12 07:55:30 +00:00
parent 3d1c40cd52
commit cb9d405db3
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/journal.rb
View File

@ -38,7 +38,7 @@ class Journal < ActiveRecord::Base
:scope => preload({:issue => :project}, :user). :scope => preload({:issue => :project}, :user).
joins("LEFT OUTER JOIN #{JournalDetail.table_name} ON #{JournalDetail.table_name}.journal_id = #{Journal.table_name}.id"). joins("LEFT OUTER JOIN #{JournalDetail.table_name} ON #{JournalDetail.table_name}.journal_id = #{Journal.table_name}.id").
where("#{Journal.table_name}.journalized_type = 'Issue' AND" + where("#{Journal.table_name}.journalized_type = 'Issue' AND" +
" (#{JournalDetail.table_name}.prop_key = 'status_id' OR #{Journal.table_name}.notes <> '')") " (#{JournalDetail.table_name}.prop_key = 'status_id' OR #{Journal.table_name}.notes <> '')").uniq
before_create :split_private_notes before_create :split_private_notes
after_create :send_notification after_create :send_notification

8
test/unit/activity_test.rb
View File

@ -76,6 +76,14 @@ class ActivityTest < ActiveSupport::TestCase
assert_nil(events.detect {|e| e.event_author != user}) assert_nil(events.detect {|e| e.event_author != user})
end end
def test_journal_with_notes_and_changes_should_be_returned_once
f = Redmine::Activity::Fetcher.new(User.anonymous, :project => Project.find(1))
f.scope = ['issues']
events = f.events
assert_equal events, events.uniq
end
def test_files_activity def test_files_activity
f = Redmine::Activity::Fetcher.new(User.anonymous, :project => Project.find(1)) f = Redmine::Activity::Fetcher.new(User.anonymous, :project => Project.find(1))
f.scope = ['files'] f.scope = ['files']