Changeset 7158
- Timestamp:
- 07/01/07 00:04:03 (3 years ago)
- Files:
-
- trunk/actionpack/CHANGELOG (modified) (1 diff)
- trunk/actionpack/lib/action_view/partials.rb (modified) (2 diffs)
- trunk/actionpack/test/controller/render_test.rb (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/actionpack/CHANGELOG
r7148 r7158 1 1 *SVN* 2 3 * Allow you to render views with periods in the name. Closes #8076 [norbert] 4 5 render :partial => 'show.html.erb' 2 6 3 7 * Improve capture helper documentation. #8796 [kampers] trunk/actionpack/lib/action_view/partials.rb
r6920 r7158 111 111 112 112 def partial_counter_name(partial_name) 113 "#{partial_name.split('/').last}_counter".intern 113 "#{partial_variable_name(partial_name)}_counter".intern 114 end 115 116 def partial_variable_name(partial_name) 117 partial_name.split('/').last.split('.').first.intern 114 118 end 115 119 116 120 def extracting_object(partial_name, local_assigns, deprecated_local_assigns) 121 variable_name = partial_variable_name(partial_name) 117 122 if local_assigns.is_a?(Hash) || local_assigns.nil? 118 controller.instance_variable_get("@#{ partial_name}")123 controller.instance_variable_get("@#{variable_name}") 119 124 else 120 125 # deprecated form where object could be passed in as second parameter … … 133 138 134 139 def add_object_to_local_assigns!(partial_name, local_assigns, object) 135 local_assigns[partial_name.intern] ||= 140 variable_name = partial_variable_name(partial_name) 141 local_assigns[variable_name] ||= 136 142 if object.is_a?(ActionView::Base::ObjectWrapper) 137 143 object.value 138 144 else 139 145 object 140 end || controller.instance_variable_get("@#{ partial_name}")146 end || controller.instance_variable_get("@#{variable_name}") 141 147 end 142 148 end trunk/actionpack/test/controller/render_test.rb
r6950 r7158 135 135 def partial 136 136 render :partial => 'partial' 137 end 138 139 def partial_dot_html 140 render :partial => 'partial.html.erb' 137 141 end 138 142 … … 394 398 end 395 399 400 def test_should_render_html_partial_with_dot 401 get :partial_dot_html 402 assert_equal 'partial html', @response.body 403 end 404 396 405 def test_should_render_html_formatted_partial_with_rjs 397 406 xhr :get, :partial_as_rjs
