Changeset 4997

Timestamp:

09/04/06 20:01:52 (2 years ago)

Author:

david

Message:

Added locals hash to partials, which makes for convenient access of some times available/some times not variables (closes #5491) [wbruce@gmail.com]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_view/base.rb (modified) (1 diff)
• trunk/actionpack/test/controller/render_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added locals hash to partials, which makes for convenient access of some times available/some times not variables #5491 [wbruce@gmail.com]. Example:
+
+    # two different render calls
+    render :partial => "person", :locals => { :include_overview => true }
+    render :partial => "person"
+    
+    # view
+    <% if locals[:include_overview] %>
+      Show overview
+    <% end %>
-
-* Fixed FormOptionsHelper#select to respect :selected value #5813

trunk/actionpack/lib/action_view/base.rb

@@ -457 +457 @@
-        @@template_args[render_symbol] = locals_keys.inject({}) { |h, k| h[k] = true; h }
-
-
+locals = local_assigns.with_indifferent_access\n
-        locals_keys.each do |key|
-          locals_code << "#{key} = local_assigns[:#{key}] if local_assigns.has_key?(:#{key})\n"

trunk/actionpack/test/controller/render_test.rb

@@ -93 +93 @@
-    ActionView::Base.local_assigns_support_string_keys = false
-  end
+
+  def accessing_locals_hash_in_inline_template
+    name = params[:local_name]
+    render :inline => "<%= 'Goodbye, ' + locals[:local_name] %>",
+           :locals => { :local_name => name }
+  end
+  
+  def accessing_locals_hash_in_inline_template_setting_string_key
+    name = params[:local_name]
+    ActionView::Base.local_assigns_support_string_keys = true
+    render :inline => "<%= 'Goodbye, ' + locals[:local_name] %>",
+           :locals => { "local_name" => name }
+    ActionView::Base.local_assigns_support_string_keys = false
+  end
+  
+  def accessing_locals_hash_in_inline_template_getting_string_key
+    name = params[:local_name]
+    ActionView::Base.local_assigns_support_string_keys = true
+    render :inline => "<%= 'Goodbye, ' + locals['local_name'] %>",
+           :locals => { :local_name => name }
+    ActionView::Base.local_assigns_support_string_keys = false
+  end  
-
-  def render_to_string_test