comparison lib/redmine/views/builders/structure.rb @ 1115:433d4f72a19b redmine-2.2

Update to Redmine SVN revision 11137 on 2.2-stable branch

 # Redmine - project management software
-# Copyright (C) 2006-2011  Jean-Philippe Lang
+# Copyright (C) 2006-2012  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.

 
 module Redmine
   module Views
     module Builders
       class Structure < BlankSlate
-        def initialize
+        attr_accessor :request, :response
+
+        def initialize(request, response)
           @struct = [{}]
+          self.request = request
+          self.response = response
         end
 
         def array(tag, options={}, &block)
           @struct << []
           block.call(self)

               else
                 @struct.last[sym] = args.first
               end
             else
               if @struct.last.is_a?(Array)
-                @struct.last << (args.last || {}).merge(:value => args.first)
+                if args.size == 1 && !block_given?
+                  @struct.last << args.first
+                else
+                  @struct.last << (args.last || {}).merge(:value => args.first)
+                end
               else
                 @struct.last[sym] = args.first
               end
             end
           end