mirror of
				https://github.com/redmine/redmine.git
				synced 2025-10-31 02:15:52 +01:00 
			
		
		
		
	Fixes commit message in issue history might be rendered in incorrect context (#42545).
Patch by Felix Schäfer (user:felix). git-svn-id: https://svn.redmine.org/redmine/trunk@23672 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
		| @@ -436,7 +436,7 @@ module ApplicationHelper | ||||
|  | ||||
|   def format_changeset_comments(changeset, options={}) | ||||
|     method = options[:short] ? :short_comments : :comments | ||||
|     textilizable changeset, method, :formatting => Setting.commit_logs_formatting? | ||||
|     textilizable changeset, method, project: changeset.project, formatting: Setting.commit_logs_formatting? | ||||
|   end | ||||
|  | ||||
|   def due_date_distance_in_words(date) | ||||
|   | ||||
							
								
								
									
										12
									
								
								test/fixtures/changesets.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										12
									
								
								test/fixtures/changesets.yml
									
									
									
									
										vendored
									
									
								
							| @@ -102,3 +102,15 @@ changesets_010: | ||||
|   user_id: 3 | ||||
|   repository_id: 10 | ||||
|   committer: dlopper | ||||
| changesets_011: | ||||
|   commit_date: "2025-04-07" | ||||
|   comments: |- | ||||
|     This commit references an issue and a [[wiki]] page | ||||
|     Refs #2 | ||||
|   committed_on: 2025-04-07 19:00:00 | ||||
|   revision: "11" | ||||
|   id: 110 | ||||
|   scmid: | ||||
|   user_id: 3 | ||||
|   repository_id: 10 | ||||
|   committer: dlopper | ||||
|   | ||||
| @@ -3265,6 +3265,22 @@ class IssuesControllerTest < Redmine::ControllerTest | ||||
|     end | ||||
|   end | ||||
|  | ||||
|   def test_show_render_changeset_comments_in_original_context | ||||
|     issue = Issue.find(9) | ||||
|     issue.changeset_ids = [110] | ||||
|     issue.save! | ||||
|  | ||||
|     @request.session[:user_id] = 2 | ||||
|     get :issue_tab, params: {id: issue.id, name: 'changesets', format: 'js'}, xhr: true | ||||
|  | ||||
|     assert_select 'div#changeset-110' do | ||||
|       # assert_select 'div.tabs a[id=?]', 'tab-changesets', text: 'unicorns' | ||||
|       assert_select 'div.changeset-comments' do | ||||
|         assert_select 'a[href=?]', '/projects/ecookbook/wiki/Wiki', text: 'wiki' | ||||
|       end | ||||
|     end | ||||
|   end | ||||
|  | ||||
|   def test_show_should_display_spent_time_tab_for_issue_with_time_entries | ||||
|     @request.session[:user_id] = 1 | ||||
|     get :show, :params => {:id => 3} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user