jro_apps/redmine Commit - r5827:fabf54a36801

Merged r5944 from trunk....

Jean-Philippe Lang -

r5827:fabf54a36801

parent child

Context file:

r5827:fabf54a36801

Collapse all files

app/models/journal.rb 0 -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 Journal < ActiveRecord::Base
               belongs_to :journalized, :polymorphic => true
               # added as a quick fix to allow eager loading of the polymorphic association
               # since always associated to an issue, for now
               belongs_to :issue, :foreign_key => :journalized_id
               belongs_to :user
               has_many :details, :class_name => "JournalDetail", :dependent => :delete_all
               attr_accessor :indice
               acts_as_event :title => Proc.new {|o| status = ((s = o.new_status) ? " (#{s})" : nil); "#{o.issue.tracker} ##{o.issue.id}#{status}: #{o.issue.subject}" },
                             :description => :notes,
                             :author => :user,
                             :type => Proc.new {|o| (s = o.new_status) ? (s.is_closed? ? 'issue-closed' : 'issue-edit') : 'issue-note' },
                             :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.issue.id, :anchor => "change-#{o.id}"}}
               acts_as_activity_provider :type => 'issues',
-                                        :permission => :view_issues,
                                         :author_key => :user_id,
                                         :find_options => {:include => [{:issue => :project}, :details, :user],
                                                           :conditions => "#{Journal.table_name}.journalized_type = 'Issue' AND" +
                                                                          " (#{JournalDetail.table_name}.prop_key = 'status_id' OR #{Journal.table_name}.notes <> '')"}
               named_scope :visible, lambda {|*args| {
                 :include => {:issue => :project},
                 :conditions => Issue.visible_condition(args.shift || User.current, *args)
               }}
               def save(*args)
                 # Do not save an empty journal
                 (details.empty? && notes.blank?) ? false : super
               end
               # Returns the new status if the journal contains a status change, otherwise nil
               def new_status
                 c = details.detect {|detail| detail.prop_key == 'status_id'}
                 (c && c.value) ? IssueStatus.find_by_id(c.value.to_i) : nil
               end
               def new_value_for(prop)
                 c = details.detect {|detail| detail.prop_key == prop}
                 c ? c.value : nil
               end
               def editable_by?(usr)
                 usr && usr.logged? && (usr.allowed_to?(:edit_issue_notes, project) || (self.user == usr && usr.allowed_to?(:edit_own_issue_notes, project)))
               end
               def project
                 journalized.respond_to?(:project) ? journalized.project : nil
               end
               def attachments
                 journalized.respond_to?(:attachments) ? journalized.attachments : nil
               end
               # Returns a string of css classes
               def css_classes
                 s = 'journal'
                 s << ' has-notes' unless notes.blank?
                 s << ' has-details' unless details.blank?
                 s
               end
               def notify?
                 @notify != false
               end
               def notify=(arg)
                 @notify = arg
               end
             end

test/fixtures/journals.yml +7 0

             ---
             journals_001:
               created_on: <%= 2.days.ago.to_date.to_s(:db) %>
               notes: "Journal notes"
               id: 1
               journalized_type: Issue
               user_id: 1
               journalized_id: 1
             journals_002:
               created_on: <%= 1.days.ago.to_date.to_s(:db) %>
               notes: "Some notes with Redmine links: #2, r2."
               id: 2
               journalized_type: Issue
               user_id: 2
               journalized_id: 1
             journals_003:
               created_on: <%= 1.days.ago.to_date.to_s(:db) %>
               notes: "A comment with inline image: !picture.jpg!"
               id: 3
               journalized_type: Issue
               user_id: 2
               journalized_id: 2
             journals_004:
               created_on: <%= 1.days.ago.to_date.to_s(:db) %>
               notes: "A comment with a private version."
               id: 4
               journalized_type: Issue
               user_id: 1
               journalized_id: 6
+            journals_005:
+              id: 5
+              created_on: <%= 1.days.ago.to_date.to_s(:db) %>
+              notes: "A comment on a private issue."
+              user_id: 2
+              journalized_type: Issue
+              journalized_id: 14

test/unit/activity_test.rb +3 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 ActivityTest < ActiveSupport::TestCase
               fixtures :projects, :versions, :attachments, :users, :roles, :members, :member_roles, :issues, :journals, :journal_details,
                        :trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations, :boards, :messages
               def setup
                 @project = Project.find(1)
               end
               def test_activity_without_subprojects
                 events = find_events(User.anonymous, :project => @project)
                 assert_not_nil events
                 assert events.include?(Issue.find(1))
                 assert !events.include?(Issue.find(4))
                 # subproject issue
                 assert !events.include?(Issue.find(5))
               end
               def test_activity_with_subprojects
                 events = find_events(User.anonymous, :project => @project, :with_subprojects => 1)
                 assert_not_nil events
                 assert events.include?(Issue.find(1))
                 # subproject issue
                 assert events.include?(Issue.find(5))
               end
               def test_global_activity_anonymous
                 events = find_events(User.anonymous)
                 assert_not_nil events
                 assert events.include?(Issue.find(1))
                 assert events.include?(Message.find(5))
                 # Issue of a private project
                 assert !events.include?(Issue.find(4))
+                # Private issue and comment
+                assert !events.include?(Issue.find(14))
+                assert !events.include?(Journal.find(5))
               end
               def test_global_activity_logged_user
                 events = find_events(User.find(2)) # manager
                 assert_not_nil events
                 assert events.include?(Issue.find(1))
                 # Issue of a private project the user belongs to
                 assert events.include?(Issue.find(4))
               end
               def test_user_activity
                 user = User.find(2)
                 events = Redmine::Activity::Fetcher.new(User.anonymous, :author => user).events(nil, nil, :limit => 10)
                 assert(events.size > 0)
                 assert(events.size <= 10)
                 assert_nil(events.detect {|e| e.event_author != user})
               end
               def test_files_activity
                 f = Redmine::Activity::Fetcher.new(User.anonymous, :project => Project.find(1))
                 f.scope = ['files']
                 events = f.events
                 assert_kind_of Array, events
                 assert events.include?(Attachment.find_by_container_type_and_container_id('Project', 1))
                 assert events.include?(Attachment.find_by_container_type_and_container_id('Version', 1))
                 assert_equal [Attachment], events.collect(&:class).uniq
                 assert_equal %w(Project Version), events.collect(&:container_type).uniq.sort
               end
               private
               def find_events(user, options={})
                 Redmine::Activity::Fetcher.new(user, options).events(Date.today - 30, Date.today + 1)
               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