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

enterprise routes use permalink

Browse Source
This commit is contained in:
Rob Harrington
2015-01-16 10:12:17 +11:00
parent 7a6cd98646
commit c3659612ed
5 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/admin/enterprises_controller.rb
View File

@@ -18,7 +18,7 @@ module Admin
end
def set_sells
enterprise = Enterprise.find(params[:id])
enterprise = Enterprise.find_by_permalink(params[:id]) || Enterprise.find(params[:id])
attributes = { sells: params[:sells] }
attributes[:producer_profile_only] = params[:sells] == "none" && !!params[:producer_profile_only]
attributes[:shop_trial_start_date] = Time.now if params[:sells] == "own"
@@ -63,6 +63,11 @@ module Admin
end
alias_method_chain :build_resource, :address
# Overriding method on Spree's resource controller,
# so that resources are found using permalink
def find_resource
Enterprise.find_by_permalink(params[:id])
end
private

4
app/controllers/api/enterprises_controller.rb
View File

@@ -29,7 +29,7 @@ module Api
end
def update
@enterprise = Enterprise.find(params[:id])
@enterprise = Enterprise.find_by_permalink(params[:id]) || Enterprise.find(params[:id])
authorize! :update, @enterprise
if @enterprise.update_attributes(params[:enterprise])
@@ -40,7 +40,7 @@ module Api
end
def update_image
@enterprise = Enterprise.find(params[:id])
@enterprise = Enterprise.find_by_permalink(params[:id]) || Enterprise.find(params[:id])
authorize! :update, @enterprise
if params[:logo] && @enterprise.update_attributes( { logo: params[:logo] } )

4
app/controllers/enterprises_controller.rb
View File

@@ -24,7 +24,7 @@ class EnterprisesController < BaseController
end
def show
@enterprise = Enterprise.find params[:id]
@enterprise = Enterprise.find_by_permalink(params[:id]) || Enterprise.find(params[:id])
# User can view this page if they've already chosen their distributor, or if this page
# is for a supplier, they may use it to select a distributor that sells this supplier's
@@ -53,7 +53,7 @@ class EnterprisesController < BaseController
end
def shop
distributor = Enterprise.is_distributor.find params[:id]
distributor = Enterprise.is_distributor.find_by_permalink(params[:id]) || Enterprise.is_distributor.find(params[:id])
order = current_order(true)
if order.distributor and order.distributor != distributor

2
app/models/enterprise.rb
View File

@@ -202,7 +202,7 @@ class Enterprise < ActiveRecord::Base
end
def to_param
"#{id}-#{name.parameterize}"
permalink
end
def relatives

20
spec/controllers/admin/enterprises_controller_spec.rb
View File

@@ -90,7 +90,7 @@ module Admin
it "does not allow 'sells' to be changed" do
profile_enterprise.enterprise_roles.build(user: user).save
controller.stub spree_current_user: user
enterprise_params = { id: profile_enterprise.id, enterprise: { sells: 'any' } }
enterprise_params = { id: profile_enterprise, enterprise: { sells: 'any' } }
spree_put :update, enterprise_params
profile_enterprise.reload
@@ -101,7 +101,7 @@ module Admin
context "as super admin" do
it "allows 'sells' to be changed" do
controller.stub spree_current_user: admin_user
enterprise_params = { id: profile_enterprise.id, enterprise: { sells: 'any' } }
enterprise_params = { id: profile_enterprise, enterprise: { sells: 'any' } }
spree_put :update, enterprise_params
profile_enterprise.reload
@@ -131,7 +131,7 @@ module Admin
context "allows setting 'sells' to 'none'" do
it "is allowed" do
spree_post :set_sells, { id: enterprise.id, sells: 'none' }
spree_post :set_sells, { id: enterprise, sells: 'none' }
expect(response).to redirect_to spree.admin_path
expect(flash[:success]).to eq "Congratulations! Registration for #{enterprise.name} is complete!"
expect(enterprise.reload.sells).to eq 'none'
@@ -139,7 +139,7 @@ module Admin
context "setting producer_profile_only to true" do
it "is allowed" do
spree_post :set_sells, { id: enterprise.id, sells: 'none', producer_profile_only: true }
spree_post :set_sells, { id: enterprise, sells: 'none', producer_profile_only: true }
expect(response).to redirect_to spree.admin_path
expect(enterprise.reload.producer_profile_only).to eq true
end
@@ -159,7 +159,7 @@ module Admin
end
it "is disallowed" do
spree_post :set_sells, { id: enterprise.id, sells: 'own' }
spree_post :set_sells, { id: enterprise, sells: 'own' }
expect(response).to redirect_to spree.admin_path
trial_expiry = Date.today.strftime("%Y-%m-%d")
expect(flash[:error]).to eq "Sorry, but you've already had a trial. Expired on: #{trial_expiry}"
@@ -175,7 +175,7 @@ module Admin
end
it "is allowed, but trial start date is not reset" do
spree_post :set_sells, { id: enterprise.id, sells: 'own' }
spree_post :set_sells, { id: enterprise, sells: 'own' }
expect(response).to redirect_to spree.admin_path
trial_expiry = (Date.today + 30.days).strftime("%Y-%m-%d")
expect(flash[:notice]).to eq "Welcome back! Your trial expires on: #{trial_expiry}"
@@ -186,7 +186,7 @@ module Admin
context "if a trial has not started" do
it "is allowed" do
spree_post :set_sells, { id: enterprise.id, sells: 'own' }
spree_post :set_sells, { id: enterprise, sells: 'own' }
expect(response).to redirect_to spree.admin_path
expect(flash[:success]).to eq "Congratulations! Registration for #{enterprise.name} is complete!"
expect(enterprise.reload.sells).to eq 'own'
@@ -196,7 +196,7 @@ module Admin
context "setting producer_profile_only to true" do
it "is ignored" do
spree_post :set_sells, { id: enterprise.id, sells: 'own', producer_profile_only: true }
spree_post :set_sells, { id: enterprise, sells: 'own', producer_profile_only: true }
expect(response).to redirect_to spree.admin_path
expect(enterprise.reload.producer_profile_only).to be false
end
@@ -205,7 +205,7 @@ module Admin
context "setting 'sells' to any" do
it "is not allowed" do
spree_post :set_sells, { id: enterprise.id, sells: 'any' }
spree_post :set_sells, { id: enterprise, sells: 'any' }
expect(response).to redirect_to spree.admin_path
expect(flash[:error]).to eq "Unauthorised"
expect(enterprise.reload.sells).to eq 'none'
@@ -214,7 +214,7 @@ module Admin
context "settiing 'sells' to 'unspecified'" do
it "is not allowed" do
spree_post :set_sells, { id: enterprise.id, sells: 'unspecified' }
spree_post :set_sells, { id: enterprise, sells: 'unspecified' }
expect(response).to redirect_to spree.admin_path
expect(flash[:error]).to eq "Unauthorised"
expect(enterprise.reload.sells).to eq 'none'