raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-04-07 07:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename API field properties to supplied_properties

Browse Source
This commit is contained in:
Rohan Mitchell
2016-08-19 11:30:20 +10:00
parent c70993ce75
commit 7b5e8fa603
5 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/darkswarm/filters/properties.js.coffee
View File

@@ -1,5 +1,5 @@
Darkswarm.filter 'properties', ()->
# Filter anything that responds to object.properties
Darkswarm.filter 'properties', ->
# Filter anything that responds to object.supplied_properties
(objects, ids) ->
objects ||= []
ids ?= []
@@ -7,10 +7,6 @@ Darkswarm.filter 'properties', ()->
# No properties selected, pass all objects through.
objects
else
objects.filter (obj)->
properties = obj.properties
# Combine object properties with supplied properties, if they exist.
# properties = properties.concat obj.supplied_properties if obj.supplied_properties
# Match property array.
properties.some (property)->
objects.filter (obj) ->
obj.supplied_properties.some (property) ->
property.id in ids

2
app/assets/javascripts/darkswarm/filters/properties_of.js.coffee
View File

@@ -2,6 +2,6 @@ Darkswarm.filter 'propertiesOf', ->
(objects)->
properties = {}
for object in objects
for property in object.properties
for property in object.supplied_properties
properties[property.id] = property
properties

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

@@ -10,7 +10,7 @@
%span.filter-shopfront.property-selectors.pad-top
%ul.inline-block
%li{"ng-repeat" => "property in enterprise.properties"}
%li{"ng-repeat" => "property in enterprise.supplied_properties"}
%a.button.tiny{"ng-bind" => "property.presentation"}
.about-container.pad-top