From 9110dc6414676d5df5b61a47bb0f0de7abbb7426 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 2 Aug 2012 15:33:39 +1000
Subject: [PATCH] Fix form local var naming for admin shared address form

---
 app/views/spree/admin/distributors/_form.html.haml   |  2 +-
 app/views/spree/admin/shared/_address_form.html.haml | 12 ++++++------
 app/views/spree/admin/suppliers/_form.html.haml      |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/spree/admin/distributors/_form.html.haml b/app/views/spree/admin/distributors/_form.html.haml
index 8494881c33..72bc885cb7 100644
--- a/app/views/spree/admin/distributors/_form.html.haml
+++ b/app/views/spree/admin/distributors/_form.html.haml
@@ -33,4 +33,4 @@
       %td Regular pickup times:
       %td= f.text_field :pickup_times
     = f.fields_for :pickup_address do |pickup_address_form|
-      = render 'spree/admin/shared/address_form', :form => pickup_address_form
+      = render 'spree/admin/shared/address_form', :f => pickup_address_form
diff --git a/app/views/spree/admin/shared/_address_form.html.haml b/app/views/spree/admin/shared/_address_form.html.haml
index d03142b161..3b8f756d88 100644
--- a/app/views/spree/admin/shared/_address_form.html.haml
+++ b/app/views/spree/admin/shared/_address_form.html.haml
@@ -1,18 +1,18 @@
 %tr{"data-hook" => "address1"}
   %td Address:
-  %td= form.text_field :address1
+  %td= f.text_field :address1
 %tr{"data-hook" => "address2"}
   %td Address (cont.):
-  %td= form.text_field :address2
+  %td= f.text_field :address2
 %tr{"data-hook" => "city"}
   %td City:
-  %td= form.text_field :city
+  %td= f.text_field :city
 %tr{"data-hook" => "zipcode"}
   %td Postcode:
-  %td= form.text_field :zipcode
+  %td= f.text_field :zipcode
 %tr{"data-hook" => "country"}
   %td Country:
-  %td= form.collection_select(:country_id, available_countries, :id, :name)
+  %td= f.collection_select(:country_id, available_countries, :id, :name)
 %tr{"data-hook" => "state"}
   %td State:
-  %td= form.collection_select(:state_id, form.object.country.states, :id, :name)
+  %td= f.collection_select(:state_id, f.object.country.states, :id, :name)
diff --git a/app/views/spree/admin/suppliers/_form.html.haml b/app/views/spree/admin/suppliers/_form.html.haml
index c1e066d2d0..7f7d69700c 100644
--- a/app/views/spree/admin/suppliers/_form.html.haml
+++ b/app/views/spree/admin/suppliers/_form.html.haml
@@ -6,7 +6,7 @@
     %td Description:
     %td= f.text_field :description
   = f.fields_for :address do |address_form|
-    = render 'spree/admin/shared/address_form', :form => address_form
+    = render 'spree/admin/shared/address_form', :f => address_form
   %tr{'data-hook' => "email"}
     %td Email:
     %td= f.text_field :email