[DRE-commits] r4457 - trunk/redmine/debian/patches

[Jérémy Lal]

Author: kapouer-guest
Date: 2009-12-13 00:10:02 +0000 (Sun, 13 Dec 2009)
New Revision: 4457

Modified:
   trunk/redmine/debian/patches/revert_rails_2.3.patch
Log:
Upstream update (introducing issues shared between projects) with rails monkey patch to support option groups.

Modified: trunk/redmine/debian/patches/revert_rails_2.3.patch
===================================================================
--- trunk/redmine/debian/patches/revert_rails_2.3.patch	2009-12-13 00:08:55 UTC (rev 4456)
+++ trunk/redmine/debian/patches/revert_rails_2.3.patch	2009-12-13 00:10:02 UTC (rev 4457)
@@ -232,6 +232,65 @@
  
  # Bootstrap the Rails environment, frameworks, and default configuration
  require File.join(File.dirname(__FILE__), 'boot')
+diff --git a/config/initializers/action_group.rb b/config/initializers/action_group.rb
+new file mode 100644
+index 0000000..8957e44
+--- /dev/null
++++ b/config/initializers/action_group.rb
+@@ -0,0 +1,16 @@
++module ActionView
++  module Helpers
++    module FormOptionsHelper
++      def grouped_options_for_select(grouped_options, selected_key = nil, prompt = nil)
++        body = ''
++        body << content_tag(:option, prompt, :value => "") if prompt
++        grouped_options = grouped_options.sort if grouped_options.is_a?(Hash)
++        grouped_options.each do |group|
++          body << content_tag(:optgroup, options_for_select(group[1], selected_key), :label => group[0])
++        end
++        body
++      end
++    end
++  end
++end
++
+diff --git a/config/initializers/action_group_test.rb b/config/initializers/action_group_test.rb
+new file mode 100644
+index 0000000..8ac2f4c
+--- /dev/null
++++ b/config/initializers/action_group_test.rb
+@@ -0,0 +1,31 @@
++require 'action_view/test_case'
++module ActionView
++  class FormOptionsHelperTest < TestCase
++    def test_grouped_options_for_select_with_array
++      assert_dom_equal(
++  	    "<optgroup label=\"North America\"><option value=\"US\">United States</option>\n<option value=\"Canada\">Canada</option></optgroup><optgroup label=\"Europe\"><option value=\"GB\">Great Britain</option>\n<option value=\"Germany\">Germany</option></optgroup>",
++	    grouped_options_for_select([
++	       ["North America",
++		       [['United States','US'],"Canada"]],
++	       ["Europe",
++		       [["Great Britain","GB"], "Germany"]]
++	     ])
++      )
++    end
++
++    def test_grouped_options_for_select_with_selected_and_prompt
++      assert_dom_equal(
++	      "<option value=\"\">Choose a product...</option><optgroup label=\"Hats\"><option value=\"Baseball Cap\">Baseball Cap</option>\n<option selected=\"selected\" value=\"Cowboy Hat\">Cowboy Hat</option></optgroup>",
++	      grouped_options_for_select([["Hats", ["Baseball Cap","Cowboy Hat"]]], "Cowboy Hat", "Choose a product...")
++      )
++    end
++
++    def test_optgroups_with_with_options_with_hash
++      assert_dom_equal(
++  	     "<optgroup label=\"Europe\"><option value=\"Denmark\">Denmark</option>\n<option value=\"Germany\">Germany</option></optgroup><optgroup label=\"North America\"><option value=\"United States\">United States</option>\n<option value=\"Canada\">Canada</option></optgroup>",
++	     grouped_options_for_select({'North America' => ['United States','Canada'], 'Europe' => ['Denmark','Germany']})
++      )
++    end
++  end
++end
++
 diff --git a/lib/SVG/Graph/Graph.rb b/lib/SVG/Graph/Graph.rb
 index 497bb7c..c188ae5 100644
 --- a/lib/SVG/Graph/Graph.rb