jro_apps/redmine Commit - r7711:1e8a9da13168

Handle the case of a text formatter that doesn't support section edit (#2222)....

Jean-Philippe Lang -

r7711:1e8a9da13168

parent child

Context file:

r7711:1e8a9da13168

app/controllers/wiki_controller.rb +6 -3

                   end
                 end
                 @editable = editable?
-                @sections_editable = @editable && User.current.allowed_to?(:edit_wiki_pages, @page.project) && params[:version].nil?
+                @sections_editable = @editable && User.current.allowed_to?(:edit_wiki_pages, @page.project) &&
+                  params[:version].nil? &&
+                  Redmine::WikiFormatting.supports_section_edit?
                 render :action => 'show'
               end
                 @content.version = @page.content.version
                 @text = @content.text
-                if params[:section].present?
+                if params[:section].present? && Redmine::WikiFormatting.supports_section_edit?
                   @section = params[:section].to_i
                   @text, @section_hash = Redmine::WikiFormatting.formatter.new(@text).get_section(@section)
                   render_404 if @text.blank?
                 @content.comments = params[:content][:comments]
                 @text = params[:content][:text]
-                if params[:section].present?
+                if params[:section].present? && Redmine::WikiFormatting.supports_section_edit?
                   @section = params[:section].to_i
                   @section_hash = params[:section_hash]
                   @content.text = Redmine::WikiFormatting.formatter.new(@content.text).update_section(params[:section].to_i, @text, @section_hash)

lib/redmine/wiki_formatting.rb +5 0

                     text
                   end
+                  # Returns true if the text formatter supports single section edit
+                  def supports_section_edit?
+                    (formatter.instance_methods & ['update_section', :update_section]).any?
+                  end
                   # Returns a cache key for the given text +format+, +object+ and +attribute+ or nil if no caching should be done
                   def cache_key_for(format, object, attribute)
                     if object && attribute && !object.new_record? && object.respond_to?(:updated_on) && !format.blank?

test/unit/lib/redmine/wiki_formatting.rb +10 0

@@ -42,4 +42,14 EXPECTED
42		42
43	assert_equal expected.gsub(%r{[\r\n\t]}, ''), Redmine::WikiFormatting::NullFormatter::Formatter.new(raw).to_html.gsub(%r{[\r\n\t]}, '')	43	assert_equal expected.gsub(%r{[\r\n\t]}, ''), Redmine::WikiFormatting::NullFormatter::Formatter.new(raw).to_html.gsub(%r{[\r\n\t]}, '')
44	end	44	end
		45
		46	def test_supports_section_edit
		47	with_settings :text_formatting => 'textile' do
		48	assert_equal true, Redmine::WikiFormatting.supports_section_edit?
		49	end
		50
		51	with_settings :text_formatting => '' do
		52	assert_equal false, Redmine::WikiFormatting.supports_section_edit?
		53	end
		54	end
45	end	55	end

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