raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-19 04:49:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removing obsolete related_enterprises_with permission method

Browse Source
This commit is contained in:
Rob Harrington
2015-05-06 12:09:54 +10:00
parent f0f7e0ee2f
commit 5cd528a87d
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/open_food_network/permissions.rb
View File

@@ -133,7 +133,7 @@ module OpenFoodNetwork
def managed_and_related_enterprises_granting(permission)
managed_enterprise_ids = managed_enterprises.pluck :id
permitting_enterprise_ids = related_enterprises_with(permission).pluck :id
permitting_enterprise_ids = granting(permission).pluck :id
Enterprise.where('id IN (?)', managed_enterprise_ids + permitting_enterprise_ids)
end
@@ -148,15 +148,6 @@ module OpenFoodNetwork
@coordinated_order_cycles = OrderCycle.managed_by(@user)
end
def related_enterprises_with(permission)
parent_ids = EnterpriseRelationship.
permitting(managed_enterprises).
with_permission(permission).
pluck(:parent_id)
Enterprise.where('id IN (?)', parent_ids)
end
def granting(permission, options={})
parent_ids = EnterpriseRelationship.
permitting(options[:to] || managed_enterprises).
@@ -180,7 +171,7 @@ module OpenFoodNetwork
end
def related_enterprise_products
Spree::Product.where('supplier_id IN (?)', related_enterprises_with(:manage_products))
Spree::Product.where('supplier_id IN (?)', granting(:manage_products))
end
end
end