diff --git a/app/assets/javascripts/admin/services/enterprise_relationships.js.coffee b/app/assets/javascripts/admin/services/enterprise_relationships.js.coffee index cb6542e3eb..e6dcbf15df 100644 --- a/app/assets/javascripts/admin/services/enterprise_relationships.js.coffee +++ b/app/assets/javascripts/admin/services/enterprise_relationships.js.coffee @@ -5,6 +5,7 @@ angular.module("ofn.admin").factory 'EnterpriseRelationships', ($http, enterpris 'add_to_order_cycle' 'manage_products' 'edit_profile' + 'create_variant_overrides' ] constructor: -> @@ -28,3 +29,4 @@ angular.module("ofn.admin").factory 'EnterpriseRelationships', ($http, enterpris when "add_to_order_cycle" then "to add to order cycle" when "manage_products" then "to manage products" when "edit_profile" then "to edit profile" + when "create_variant_overrides" then "to override variant details" diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb index d126e489ae..81615afd2d 100644 --- a/app/models/enterprise.rb +++ b/app/models/enterprise.rb @@ -373,7 +373,8 @@ class Enterprise < ActiveRecord::Base child: hub, permissions_list: [:add_to_order_cycle, :manage_products, - :edit_profile]) + :edit_profile, + :create_variant_overrides]) end end diff --git a/spec/features/admin/enterprise_relationships_spec.rb b/spec/features/admin/enterprise_relationships_spec.rb index 83576c7456..3a2d9692de 100644 --- a/spec/features/admin/enterprise_relationships_spec.rb +++ b/spec/features/admin/enterprise_relationships_spec.rb @@ -43,13 +43,14 @@ feature %q{ check 'to manage products' uncheck 'to manage products' check 'to edit profile' + check 'to override variant details' select 'Two', from: 'enterprise_relationship_child_id' click_button 'Create' - page.should have_relationship e1, e2, ['to add to order cycle', 'to edit profile'] + page.should have_relationship e1, e2, ['to add to order cycle', 'to override variant details', 'to edit profile'] er = EnterpriseRelationship.where(parent_id: e1, child_id: e2).first er.should be_present - er.permissions.map(&:name).sort.should == ['add_to_order_cycle', 'edit_profile'].sort + er.permissions.map(&:name).sort.should == ['add_to_order_cycle', 'edit_profile', 'create_variant_overrides'].sort end diff --git a/spec/javascripts/unit/admin/services/enterprise_relationships_spec.js.coffee b/spec/javascripts/unit/admin/services/enterprise_relationships_spec.js.coffee index c7ebb1b1ba..0d8e50fc5a 100644 --- a/spec/javascripts/unit/admin/services/enterprise_relationships_spec.js.coffee +++ b/spec/javascripts/unit/admin/services/enterprise_relationships_spec.js.coffee @@ -15,3 +15,4 @@ describe "enterprise relationships", -> expect(EnterpriseRelationships.permission_presentation("add_to_order_cycle")).toEqual "to add to order cycle" expect(EnterpriseRelationships.permission_presentation("manage_products")).toEqual "to manage products" expect(EnterpriseRelationships.permission_presentation("edit_profile")).toEqual "to edit profile" + expect(EnterpriseRelationships.permission_presentation("create_variant_overrides")).toEqual "to override variant details" diff --git a/spec/models/enterprise_spec.rb b/spec/models/enterprise_spec.rb index f2fc256c16..15bc7c2bbd 100644 --- a/spec/models/enterprise_spec.rb +++ b/spec/models/enterprise_spec.rb @@ -613,7 +613,7 @@ describe Enterprise do [er1, er2].each do |er| er.parent.should == enterprise - er.permissions.map(&:name).sort.should == ['add_to_order_cycle', 'manage_products', 'edit_profile'].sort + er.permissions.map(&:name).sort.should == ['add_to_order_cycle', 'manage_products', 'edit_profile', 'create_variant_overrides'].sort end end