jro_apps/redmine Commit - r13572:e11f77a4b038

Show long text custom field changes as a diff (#15236)....

Jean-Philippe Lang -

r13572:e11f77a4b038

parent child

Context file:

r13572:e11f77a4b038

Collapse all files

app/controllers/journals_controller.rb +10 -2

@@ -49,9 +49,17 class JournalsController < ApplicationController
49	if params[:detail_id].present?	49	if params[:detail_id].present?
50	@detail = @journal.details.find_by_id(params[:detail_id])	50	@detail = @journal.details.find_by_id(params[:detail_id])
51	else	51	else
52	@detail = @journal.details.detect {\|d\| d.prop_key == 'description'}	52	@detail = @journal.details.detect {\|d\| d.property == 'attr' && d.prop_key == 'description'}
		53	end
		54	unless @issue && @detail
		55	render_404
		56	return false
		57	end
		58	if @detail.property == 'cf'
		59	unless @detail.custom_field && @detail.custom_field.visible_by?(@issue.project, User.current)
		60	raise ::Unauthorized
		61	end
53	end	62	end
54	(render_404; return false) unless @issue && @detail
55	@diff = Redmine::Helpers::Diff.new(@detail.value, @detail.old_value)	63	@diff = Redmine::Helpers::Diff.new(@detail.value, @detail.old_value)
56	end	64	end
57		65

app/helpers/issues_helper.rb +13 -4

               # Returns the textual representation of a single journal detail
               def show_detail(detail, no_html=false, options={})
                 multiple = false
+                show_diff = false
                 case detail.property
                 when 'attr'
                   field = detail.prop_key.to_s.gsub(/\_id$/, "")
                   when 'is_private'
                     value = l(detail.value == "0" ? :general_text_No : :general_text_Yes) unless detail.value.blank?
                     old_value = l(detail.old_value == "0" ? :general_text_No : :general_text_Yes) unless detail.old_value.blank?
+                  when 'description'
+                    show_diff = true
                   end
                 when 'cf'
                   custom_field = detail.custom_field
                   if custom_field
-                    multiple = custom_field.multiple?
                     label = custom_field.name
-                    value = format_value(detail.value, custom_field) if detail.value
+                    if custom_field.format.class.change_as_diff
-                    old_value = format_value(detail.old_value, custom_field) if detail.old_value
+                      show_diff = true
+                    else
+                      multiple = custom_field.multiple?
+                      value = format_value(detail.value, custom_field) if detail.value
+                      old_value = format_value(detail.old_value, custom_field) if detail.old_value
+                    end
                   end
                 when 'attachment'
                   label = l(:label_attachment)
                   end
                 end
-                if detail.property == 'attr' && detail.prop_key == 'description'
+                if show_diff
                   s = l(:text_journal_changed_no_detail, :label => label)
                   unless no_html
                     diff_link = link_to 'diff',

lib/redmine/field_format.rb +4 0

                   class_attribute :form_partial
                   self.form_partial = nil
+                  class_attribute :change_as_diff
+                  self.change_as_diff = false
                   def self.add(name)
                     self.format_name = name
                     Redmine::FieldFormat.add(name, self)
                   add 'text'
                   self.searchable_supported = true
                   self.form_partial = 'custom_fields/formats/text'
+                  self.change_as_diff = true
                   def formatted_value(view, custom_field, value, customized=nil, html=false)
                     if html

test/functional/journals_controller_test.rb +25 -1

@@ -51,7 +51,7 class JournalsControllerTest < ActionController::TestCase
51	assert_not_include journal, assigns(:journals)	51	assert_not_include journal, assigns(:journals)
52	end	52	end
53		53
54	def test_diff	54	def test_diff_for_description_change
55	get :diff, :id => 3, :detail_id => 4	55	get :diff, :id => 3, :detail_id => 4
56	assert_response :success	56	assert_response :success
57	assert_template 'diff'	57	assert_template 'diff'
@@ -60,6 +60,30 class JournalsControllerTest < ActionController::TestCase
60	assert_select 'span.diff_in', :text => /added/	60	assert_select 'span.diff_in', :text => /added/
61	end	61	end
62		62
		63	def test_diff_for_custom_field
		64	field = IssueCustomField.create!(:name => "Long field", :field_format => 'text')
		65	journal = Journal.create!(:journalized => Issue.find(2), :notes => 'Notes', :user_id => 1)
		66	detail = JournalDetail.create!(:journal => journal, :property => 'cf', :prop_key => field.id,
		67	:old_value => 'Foo', :value => 'Bar')
		68
		69	get :diff, :id => journal.id, :detail_id => detail.id
		70	assert_response :success
		71	assert_template 'diff'
		72
		73	assert_select 'span.diff_out', :text => /Foo/
		74	assert_select 'span.diff_in', :text => /Bar/
		75	end
		76
		77	def test_diff_for_custom_field_should_be_denied_if_custom_field_is_not_visible
		78	field = IssueCustomField.create!(:name => "Long field", :field_format => 'text', :visible => false, :role_ids => [1])
		79	journal = Journal.create!(:journalized => Issue.find(2), :notes => 'Notes', :user_id => 1)
		80	detail = JournalDetail.create!(:journal => journal, :property => 'cf', :prop_key => field.id,
		81	:old_value => 'Foo', :value => 'Bar')
		82
		83	get :diff, :id => journal.id, :detail_id => detail.id
		84	assert_response 302
		85	end
		86
63	def test_diff_should_default_to_description_diff	87	def test_diff_should_default_to_description_diff
64	get :diff, :id => 3	88	get :diff, :id => 3
65	assert_response :success	89	assert_response :success

test/unit/helpers/issues_helper_test.rb +13 0

                 assert_match '6.30', show_detail(detail, true)
               end
+              test 'show_detail should not show values with a description attribute' do
+                detail = JournalDetail.new(:property => 'attr', :prop_key => 'description',
+                                           :old_value => 'Foo', :value => 'Bar')
+                assert_equal 'Description updated', show_detail(detail, true)
+              end
               test 'show_detail should show old and new values with a custom field' do
                 detail = JournalDetail.new(:property => 'cf', :prop_key => '1',
                                            :old_value => 'MySQL', :value => 'PostgreSQL')
                 assert_equal 'Database changed from MySQL to PostgreSQL', show_detail(detail, true)
               end
+              test 'show_detail should not show values with a long text custom field' do
+                field = IssueCustomField.create!(:name => "Long field", :field_format => 'text')
+                detail = JournalDetail.new(:property => 'cf', :prop_key => field.id,
+                                           :old_value => 'Foo', :value => 'Bar')
+                assert_equal 'Long field updated', show_detail(detail, true)
+              end
               test 'show_detail should show added file' do
                 detail = JournalDetail.new(:property => 'attachment', :prop_key => '1',
                                            :old_value => nil, :value => 'error281.txt')

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