jro_apps/redmine Commit - r12175:0dc98aabe635

Adds an option for formatter display name....

Jean-Philippe Lang -

r12175:0dc98aabe635

parent child

Context file:

r12175:0dc98aabe635

app/views/settings/_general.html.erb +1 -1

             <p><%= setting_select :protocol, [['HTTP', 'http'], ['HTTPS', 'https']] %></p>
-            <p><%= setting_select :text_formatting, Redmine::WikiFormatting.format_names.collect{|name| [name, name.to_s]}, :blank => :label_none %></p>
+            <p><%= setting_select :text_formatting, Redmine::WikiFormatting.formats_for_select, :blank => :label_none %></p>
             <p><%= setting_check_box :cache_formatted_text %></p>

lib/redmine/wiki_formatting.rb +12 -3

                     yield self
                   end
-                  def register(name, formatter, helper)
+                  def register(name, formatter, helper, options={})
-                    raise ArgumentError, "format name '#{name}' is already taken" if @@formatters[name.to_s]
+                    name = name.to_s
-                    @@formatters[name.to_s] = {:formatter => formatter, :helper => helper}
+                    raise ArgumentError, "format name '#{name}' is already taken" if @@formatters[name]
+                    @@formatters[name] = {
+                      :formatter => formatter,
+                      :helper => helper,
+                      :label => options[:label] || name.humanize
+                    }
                   end
                   def formatter
                     @@formatters.keys.map
                   end
+                  def formats_for_select
+                    @@formatters.map {|name, options| [options[:label], name]}
+                  end
                   def to_html(format, text, options = {})
                     text = if Setting.cache_formatted_text? && text.size > 2.kilobyte && cache_store && cache_key = cache_key_for(format, text, options[:object], options[:attribute])
                       # Text retrieved from the cache store may be frozen

test/unit/lib/redmine/wiki_formatting_test.rb +4 0

                 assert_equal Redmine::WikiFormatting::NullFormatter::Helper, Redmine::WikiFormatting.helper_for('')
               end
+              def test_formats_for_select
+                assert_include ['Textile', 'textile'], Redmine::WikiFormatting.formats_for_select
+              end
               def test_should_link_urls_and_email_addresses
                 raw = <<-DIFF
             This is a sample *text* with a link: http://www.redmine.org

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