raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-01 02:03:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix display of state_name, after attribute was renamed in serializer

Browse Source
This commit is contained in:
Rohan Mitchell
2014-08-07 15:08:07 +10:00
parent c2690d0c20
commit f8c71ced45
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/templates/partials/enterprise_header.html.haml
View File

@@ -1,7 +1,7 @@
.highlight
.highlight-top
%p.right
{{ [enterprise.address.city, enterprise.address.state] | printArray}}
{{ [enterprise.address.city, enterprise.address.state_name] | printArray}}
%h3{"ng-if" => "enterprise.is_distributor"}
%a{"bo-href" => "enterprise.path", "ofn-empties-cart" => "enterprise", bindonce: true}
%i.ofn-i_040-hub

2
app/assets/javascripts/templates/partials/hub_actions.html.haml
View File

@@ -11,6 +11,6 @@
%i.ofn-i_033-open-sign{"bo-if" => "hub.active"}
%i.ofn-i_032-closed-sign{"bo-if" => "!hub.active"}
{{hub.name}}
.button-address {{ hub.address.city }} , {{hub.address.state}}
.button-address {{ hub.address.city }} , {{hub.address.state_name}}
%i.ofn-i_007-caret-right

2
app/assets/javascripts/templates/partials/hub_details.html.haml
View File

@@ -20,5 +20,5 @@
%i.ofn-i_033-open-sign{"bo-if" => "enterprise.active"}
%i.ofn-i_032-closed-sign{"bo-if" => "!enterprise.active"}
{{enterprise.name}}
.button-address {{ enterprise.address.city }} , {{enterprise.address.state}}
.button-address {{ enterprise.address.city }} , {{enterprise.address.state_name}}
%i.ofn-i_007-caret-right

1
spec/features/consumer/groups_spec.rb
View File

@@ -17,5 +17,6 @@ feature 'Groups', js: true do
page.should have_content enterprise.name
open_enterprise_modal enterprise
modal_should_be_open_for enterprise
page.should have_content "Herndon, Vic"
end
end