Changeset 8814
- Timestamp:
- 02/07/08 17:11:04 (7 months ago)
- Files:
-
- branches/2-0-stable/actionpack/CHANGELOG (modified) (1 diff)
- branches/2-0-stable/actionpack/lib/action_controller/request.rb (modified) (1 diff)
- branches/2-0-stable/actionpack/lib/action_controller/templates/rescues/_trace.erb (modified) (2 diffs)
- branches/2-0-stable/actionpack/lib/action_view/helpers/form_helper.rb (modified) (1 diff)
- branches/2-0-stable/actionpack/test/controller/request_test.rb (modified) (1 diff)
- branches/2-0-stable/activesupport/CHANGELOG (modified) (1 diff)
- branches/2-0-stable/activesupport/lib/active_support/core_ext/test/unit/assertions.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/2-0-stable/actionpack/CHANGELOG
r8783 r8814 1 1 *SVN* 2 3 * Remove ERB trim variables from trace template in case ActionView::Base.erb_trim_mode is changed in the application. #10098 [tpope, kampers] 4 5 * Fix typo in form_helper documentation. #10650 [xaviershay, kampers] 6 7 * Fix bug with setting Request#format= after the getter has cached the value. #10889 [cch1] 2 8 3 9 * TestSession supports indifferent access. #7372 [tamc, Arsen7, mhackett, julik, jean.helou] branches/2-0-stable/actionpack/lib/action_controller/request.rb
r8425 r8814 112 112 def format=(extension) 113 113 parameters[:format] = extension.to_s 114 format114 @format = Mime::Type.lookup_by_extension(parameters[:format]) 115 115 end 116 116 branches/2-0-stable/actionpack/lib/action_controller/templates/rescues/_trace.erb
r6180 r8814 11 11 12 12 <div id="traces"> 13 <% names.each do |name| -%>13 <% names.each do |name| %> 14 14 <% 15 15 show = "document.getElementById('#{name.gsub /\s/, '-'}').style.display='block';" … … 17 17 %> 18 18 <a href="#" onclick="<%= hide %><%= show %>; return false;"><%= name %></a> <%= '|' unless names.last == name %> 19 <% end -%>19 <% end %> 20 20 21 <% traces.each do |name, trace| -%>21 <% traces.each do |name, trace| %> 22 22 <div id="<%= name.gsub /\s/, '-' %>" style="display: <%= name == "Application Trace" ? 'block' : 'none' %>;"> 23 23 <pre><code><%= trace.join "\n" %></code></pre> 24 24 </div> 25 <% end -%>25 <% end %> 26 26 </div> branches/2-0-stable/actionpack/lib/action_view/helpers/form_helper.rb
r8600 r8814 158 158 # def labelled_form_for(record_or_name_or_array, *args, &proc) 159 159 # options = args.extract_options! 160 # form_for(record_or_name_or_array, *(args << options.merge(:builder => LabellingFormBuil er)), &proc)160 # form_for(record_or_name_or_array, *(args << options.merge(:builder => LabellingFormBuilder)), &proc) 161 161 # end 162 162 # branches/2-0-stable/actionpack/test/controller/request_test.rb
r8433 r8814 370 370 @request.env["CONTENT_TYPE"] = "text/html" 371 371 assert_equal Mime::HTML, @request.content_type 372 end 373 374 def test_format_assignment_should_set_format 375 @request.instance_eval { self.format = :txt } 376 assert !@request.format.xml? 377 @request.instance_eval { self.format = :xml } 378 assert @request.format.xml? 372 379 end 373 380 branches/2-0-stable/activesupport/CHANGELOG
r8585 r8814 1 1 *SVN* 2 3 * Remove :nodoc: entries around the ActiveSupport test/unit assertions. #10946 [dancroak, jamesh] 2 4 3 5 * Fixed String#titleize to work for strings with 's too #10571 [trek] branches/2-0-stable/activesupport/lib/active_support/core_ext/test/unit/assertions.rb
r7719 r8814 1 module Test #:nodoc: 2 module Unit #:nodoc: 1 module Test 2 module Unit 3 #-- 3 4 # FIXME: no Proc#binding in Ruby 2, must change this API 4 module Assertions #:nodoc: 5 #++ 6 module Assertions 5 7 # Test numeric difference between the return value of an expression as a result of what is evaluated 6 8 # in the yielded block.
