jro_apps/redmine Commit - r11784:7509dda1ff58

Fixed that relations to issues that are not visible are displayed in the issue history (#1005)....

Jean-Philippe Lang -

r11784:7509dda1ff58

parent child

Context file:

r11784:7509dda1ff58

Collapse all files

app/models/journal.rb +3 0

             # Redmine - project management software
             # Copyright (C) 2006-2013  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,
                             :group => :issue,
                             :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',
                                         :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 <> '')"}
               before_create :split_private_notes
               scope :visible, lambda {|*args|
                 user = args.shift || User.current
                 includes(:issue => :project).
                   where(Issue.visible_condition(user, *args)).
                   where("(#{Journal.table_name}.private_notes = ? OR (#{Project.allowed_to_condition(user, :view_private_notes, *args)}))", false)
               }
               def save(*args)
                 # Do not save an empty journal
                 (details.empty? && notes.blank?) ? false : super
               end
+              # Returns journal details that are visible to user
               def visible_details(user=User.current)
                 details.select do |detail|
                   if detail.property == 'cf'
                     field_id = detail.prop_key
                     field = CustomField.find_by_id(field_id)
                     field && field.visible_by?(project, user)
+                  elsif detail.property == 'relation'
+                    Issue.find_by_id(detail.value || detail.old_value).try(:visible?, user)
                   else
                     true
                   end
                 end
               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 << ' private-notes' if private_notes?
                 s
               end
               def notify?
                 @notify != false
               end
               def notify=(arg)
                 @notify = arg
               end
               def notified_users
                 notified = journalized.notified_users
                 if private_notes?
                   notified = notified.select {|user| user.allowed_to?(:view_private_notes, journalized.project)}
                 end
                 notified
               end
               def recipients
                 notified_users.map(&:mail)
               end
               def notified_watchers
                 notified = journalized.notified_watchers
                 if private_notes?
                   notified = notified.select {|user| user.allowed_to?(:view_private_notes, journalized.project)}
                 end
                 notified
               end
               def watcher_recipients
                 notified_watchers.map(&:mail)
               end
               private
               def split_private_notes
                 if private_notes?
                   if notes.present?
                     if details.any?
                       # Split the journal (notes/changes) so we don't have half-private journals
                       journal = Journal.new(:journalized => journalized, :user => user, :notes => nil, :private_notes => false)
                       journal.details = details
                       journal.save
                       self.details = []
                       self.created_on = journal.created_on
                     end
                   else
                     # Blank notes should not be private
                     self.private_notes = false
                   end
                 end
                 true
               end
             end

test/unit/journal_test.rb +19 0

             # Redmine - project management software
             # Copyright (C) 2006-2013  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 JournalTest < ActiveSupport::TestCase
               fixtures :projects, :issues, :issue_statuses, :journals, :journal_details,
                        :users, :members, :member_roles, :roles, :enabled_modules,
                        :projects_trackers, :trackers
               def setup
                 @journal = Journal.find 1
               end
               def test_journalized_is_an_issue
                 issue = @journal.issue
                 assert_kind_of Issue, issue
                 assert_equal 1, issue.id
               end
               def test_new_status
                 status = @journal.new_status
                 assert_not_nil status
                 assert_kind_of IssueStatus, status
                 assert_equal 2, status.id
               end
               def test_create_should_send_email_notification
                 ActionMailer::Base.deliveries.clear
                 issue = Issue.first
                 user = User.first
                 journal = issue.init_journal(user, issue)
                 assert journal.save
                 assert_equal 1, ActionMailer::Base.deliveries.size
               end
               def test_should_not_save_journal_with_blank_notes_and_no_details
                 journal = Journal.new(:journalized => Issue.first, :user => User.first)
                 assert_no_difference 'Journal.count' do
                   assert_equal false, journal.save
                 end
               end
               def test_create_should_not_split_non_private_notes
                 assert_difference 'Journal.count' do
                   assert_no_difference 'JournalDetail.count' do
                     journal = Journal.generate!(:notes => 'Notes')
                   end
                 end
                 assert_difference 'Journal.count' do
                   assert_difference 'JournalDetail.count' do
                     journal = Journal.generate!(:notes => 'Notes', :details => [JournalDetail.new])
                   end
                 end
                 assert_difference 'Journal.count' do
                   assert_difference 'JournalDetail.count' do
                     journal = Journal.generate!(:notes => '', :details => [JournalDetail.new])
                   end
                 end
               end
               def test_create_should_split_private_notes
                 assert_difference 'Journal.count' do
                   assert_no_difference 'JournalDetail.count' do
                     journal = Journal.generate!(:notes => 'Notes', :private_notes => true)
                     journal.reload
                     assert_equal true, journal.private_notes
                     assert_equal 'Notes', journal.notes
                   end
                 end
                 assert_difference 'Journal.count', 2 do
                   assert_difference 'JournalDetail.count' do
                     journal = Journal.generate!(:notes => 'Notes', :private_notes => true, :details => [JournalDetail.new])
                     journal.reload
                     assert_equal true, journal.private_notes
                     assert_equal 'Notes', journal.notes
                     assert_equal 0, journal.details.size
                     journal_with_changes = Journal.order('id DESC').offset(1).first
                     assert_equal false, journal_with_changes.private_notes
                     assert_nil journal_with_changes.notes
                     assert_equal 1, journal_with_changes.details.size
                     assert_equal journal.created_on, journal_with_changes.created_on
                   end
                 end
                 assert_difference 'Journal.count' do
                   assert_difference 'JournalDetail.count' do
                     journal = Journal.generate!(:notes => '', :private_notes => true, :details => [JournalDetail.new])
                     journal.reload
                     assert_equal false, journal.private_notes
                     assert_equal '', journal.notes
                     assert_equal 1, journal.details.size
                   end
                 end
               end
               def test_visible_scope_for_anonymous
                 # Anonymous user should see issues of public projects only
                 journals = Journal.visible(User.anonymous).all
                 assert journals.any?
                 assert_nil journals.detect {|journal| !journal.issue.project.is_public?}
                 # Anonymous user should not see issues without permission
                 Role.anonymous.remove_permission!(:view_issues)
                 journals = Journal.visible(User.anonymous).all
                 assert journals.empty?
               end
               def test_visible_scope_for_user
                 user = User.find(9)
                 assert user.projects.empty?
                 # Non member user should see issues of public projects only
                 journals = Journal.visible(user).all
                 assert journals.any?
                 assert_nil journals.detect {|journal| !journal.issue.project.is_public?}
                 # Non member user should not see issues without permission
                 Role.non_member.remove_permission!(:view_issues)
                 user.reload
                 journals = Journal.visible(user).all
                 assert journals.empty?
                 # User should see issues of projects for which user has view_issues permissions only
                 Member.create!(:principal => user, :project_id => 1, :role_ids => [1])
                 user.reload
                 journals = Journal.visible(user).all
                 assert journals.any?
                 assert_nil journals.detect {|journal| journal.issue.project_id != 1}
               end
               def test_visible_scope_for_admin
                 user = User.find(1)
                 user.members.each(&:destroy)
                 assert user.projects.empty?
                 journals = Journal.visible(user).all
                 assert journals.any?
                 # Admin should see issues on private projects that admin does not belong to
                 assert journals.detect {|journal| !journal.issue.project.is_public?}
               end
               def test_details_should_normalize_dates
                 j = JournalDetail.create!(:old_value => Date.parse('2012-11-03'), :value => Date.parse('2013-01-02'))
                 j.reload
                 assert_equal '2012-11-03', j.old_value
                 assert_equal '2013-01-02', j.value
               end
               def test_details_should_normalize_true_values
                 j = JournalDetail.create!(:old_value => true, :value => true)
                 j.reload
                 assert_equal '1', j.old_value
                 assert_equal '1', j.value
               end
               def test_details_should_normalize_false_values
                 j = JournalDetail.create!(:old_value => false, :value => false)
                 j.reload
                 assert_equal '0', j.old_value
                 assert_equal '0', j.value
               end
+              def test_visible_details_should_include_relations_to_visible_issues_only
+                issue = Issue.generate!
+                visible_issue = Issue.generate!
+                IssueRelation.create!(:issue_from => issue, :issue_to => visible_issue, :relation_type => 'relates')
+                hidden_issue = Issue.generate!(:is_private => true)
+                IssueRelation.create!(:issue_from => issue, :issue_to => hidden_issue, :relation_type => 'relates')
+                issue.reload
+                assert_equal 1, issue.journals.size
+                journal = issue.journals.first
+                assert_equal 2, journal.details.size
+                visible_details = journal.visible_details(User.anonymous)
+                assert_equal 1, visible_details.size
+                assert_equal visible_issue.id.to_s, visible_details.first.value
+                visible_details = journal.visible_details(User.find(2))
+                assert_equal 2, visible_details.size
+              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