From 9085741f3c75b3ab806b25b3afcea68daee6a05b Mon Sep 17 00:00:00 2001 From: Rob H Date: Thu, 11 Sep 2014 11:40:22 +1000 Subject: [PATCH] Removing enterprises form from user edit page --- .../users_add_enterprise_management.rb | 6 ----- .../admin/users/_enterprises_form.html.haml | 13 ---------- spec/features/admin/enterprise_user_spec.rb | 24 ------------------- 3 files changed, 43 deletions(-) delete mode 100644 app/overrides/users_add_enterprise_management.rb delete mode 100644 app/views/spree/admin/users/_enterprises_form.html.haml diff --git a/app/overrides/users_add_enterprise_management.rb b/app/overrides/users_add_enterprise_management.rb deleted file mode 100644 index 4ca1dd9e49..0000000000 --- a/app/overrides/users_add_enterprise_management.rb +++ /dev/null @@ -1,6 +0,0 @@ -Deface::Override.new(:virtual_path => "spree/admin/users/_form", - :insert_after => "[data-hook='admin_user_form_fields']", - :partial => "spree/admin/users/enterprises_form", - :name => "add_enterprises_to_user" - ) - diff --git a/app/views/spree/admin/users/_enterprises_form.html.haml b/app/views/spree/admin/users/_enterprises_form.html.haml deleted file mode 100644 index 03cecd41d5..0000000000 --- a/app/views/spree/admin/users/_enterprises_form.html.haml +++ /dev/null @@ -1,13 +0,0 @@ -%fieldset - %legend 'Manage Enterprises' - = f.field_container :enterprise_roles do - - f.object.build_enterprise_roles - %table - = f.fields_for :enterprise_roles do |enterprise_form| - %tr - %td - = hidden_field_tag "#{enterprise_form.object_name}[_destroy]", 1, :id => nil - = check_box_tag "#{enterprise_form.object_name}[_destroy]", 0, !enterprise_form.object.new_record? - %td - = label_tag "#{enterprise_form.object_name}[_destroy]", enterprise_form.object.enterprise.name - = enterprise_form.hidden_field :enterprise_id diff --git a/spec/features/admin/enterprise_user_spec.rb b/spec/features/admin/enterprise_user_spec.rb index ed46a1e0c1..3431e92d36 100644 --- a/spec/features/admin/enterprise_user_spec.rb +++ b/spec/features/admin/enterprise_user_spec.rb @@ -31,30 +31,6 @@ feature %q{ user.enterprises.first.name.should == supplier2.name end end - - context "with existing enterprises managed" do - before do - user.enterprise_roles.create!(enterprise: supplier1) - user.enterprise_roles.create!(enterprise: distributor1) - end - - it "can remove and add enterprise management for a user" do - login_to_admin_section - - click_link 'Users' - click_link user.email - click_link 'Edit' - - uncheck distributor1.name # remove - check distributor2.name # add - - click_button 'Update' - - user.enterprises.count.should == 2 - user.enterprises.should include supplier1 - user.enterprises.should include distributor2 - end - end end describe "product management" do