diff --git a/lib/redmine/views/builders/structure.rb b/lib/redmine/views/builders/structure.rb index c168bd73..9b948158 100644 --- 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 diff --git a/test/unit/lib/redmine/views/builders/json_test.rb b/test/unit/lib/redmine/views/builders/json_test.rb index 195fba02..919fe223 100644 --- 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