jro_apps/redmine Commit - r15799:7b32a0371d55

Let user always see his private notes (#17632)....

Jean-Philippe Lang -

r15799:7b32a0371d55

parent child

Context file:

r15799:7b32a0371d55

app/models/issue.rb +6 -6

               belongs_to :category, :class_name => 'IssueCategory'
               has_many :journals, :as => :journalized, :dependent => :destroy, :inverse_of => :journalized
-              has_many :visible_journals,
-                lambda {where(["(#{Journal.table_name}.private_notes = ? OR (#{Project.allowed_to_condition(User.current, :view_private_notes)}))", false])},
-                :class_name => 'Journal',
-                :as => :journalized
               has_many :time_entries, :dependent => :destroy
               has_and_belongs_to_many :changesets, lambda {order("#{Changeset.table_name}.committed_on ASC, #{Changeset.table_name}.id ASC")}
                   reorder(:created_on, :id).to_a
                 result.each_with_index {|j,i| j.indice = i+1}
-                result.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, project)
+                unless user.allowed_to?(:view_private_notes, project)
+                  result.select! do |journal|
+                    !journal.private_notes? || journal.user == user
+                  end
+                end
                 Journal.preload_journals_details_custom_fields(result)
                 result.select! {|journal| journal.notes? || journal.visible_details.any?}
                 result

app/models/journal.rb +2 -1

               scope :visible, lambda {|*args|
                 user = args.shift || User.current
+                private_notes_condition = Project.allowed_to_condition(user, :view_private_notes, *args)
                 joins(: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)
+                  where("(#{Journal.table_name}.private_notes = ? OR #{Journal.table_name}.user_id = ? OR (#{private_notes_condition}))", false, user.id)
               }
               safe_attributes 'notes',

test/functional/issues_controller_test.rb +14 0

@@ -1605,6 +1605,20 class IssuesControllerTest < Redmine::ControllerTest
1605	assert_select "#change-#{journal.id}", 0	1605	assert_select "#change-#{journal.id}", 0
1606	end	1606	end
1607		1607
		1608	def test_show_should_display_private_notes_created_by_current_user
		1609	User.find(3).roles_for_project(Project.find(1)).each do \|role\|
		1610	role.remove_permission! :view_private_notes
		1611	end
		1612	visible = Journal.create!(:journalized => Issue.find(2), :notes => 'Private notes', :private_notes => true, :user_id => 3)
		1613	not_visible = Journal.create!(:journalized => Issue.find(2), :notes => 'Private notes', :private_notes => true, :user_id => 1)
		1614	@request.session[:user_id] = 3
		1615
		1616	get :show, :id => 2
		1617	assert_response :success
		1618	assert_select "#change-#{visible.id}", 1
		1619	assert_select "#change-#{not_visible.id}", 0
		1620	end
		1621
1608	def test_show_atom	1622	def test_show_atom
1609	get :show, :id => 2, :format => 'atom'	1623	get :show, :id => 2, :format => 'atom'
1610	assert_response :success	1624	assert_response :success

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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