Fixes unhandled case in json builder.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4463 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixes unhandled case in json builder.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4463 e93f8b46-1217-0410-a6f0-8f06a7374b81
558a951e · Jean-Philippe Lang · 37ed0255 · 558a951e · 558a951e
Commit 558a951e authored Dec 04, 2010 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 1 deletion

structure.rb lib/redmine/views/builders/structure.rb +5 -1

json_test.rb test/unit/lib/redmine/views/builders/json_test.rb +7 -0

No files found.
--- a/lib/redmine/views/builders/structure.rb
+++ b/lib/redmine/views/builders/structure.rb
@@ -56,7 +56,11 @@ module Redmine
            if @struct.last.is_a?(Array)
              @struct.last << ret
            else
-              @struct.last[sym] = ret
+              if @struct.last.has_key?(sym) && @struct.last[sym].is_a?(Hash)
+                @struct.last[sym].merge! ret
+              else
+                @struct.last[sym] = ret
+              end
            end
          end
        end

--- a/test/unit/lib/redmine/views/builders/json_test.rb
+++ b/test/unit/lib/redmine/views/builders/json_test.rb
@@ -35,6 +35,13 @@ class Redmine::Views::Builders::JsonTest < HelperTestCase
        b.birth :city => 'London', :country => 'UK'
      end
    end
+    
+    assert_json_output({'person' => {'id' => 1, 'name' => 'Ryan', 'birth' => {'city' => 'London', 'country' => 'UK'}}}) do |b|
+      b.person :id => 1 do
+        b.name 'Ryan'
+        b.birth :city => 'London', :country => 'UK'
+      end
+    end
  end
  
  def test_array