From 900ef4ddccb8a8bad8b31fb6332874803f18c2fa Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Fri, 24 Oct 2014 11:12:54 +1100 Subject: [PATCH] Change type form is aware of existing state of enterprise --- .../controllers/change_type_form_controller.js.coffee | 6 +++--- app/serializers/api/admin/enterprise_serializer.rb | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/admin/enterprises/controllers/change_type_form_controller.js.coffee b/app/assets/javascripts/admin/enterprises/controllers/change_type_form_controller.js.coffee index 02bd5e253c..c2f96f254f 100644 --- a/app/assets/javascripts/admin/enterprises/controllers/change_type_form_controller.js.coffee +++ b/app/assets/javascripts/admin/enterprises/controllers/change_type_form_controller.js.coffee @@ -1,7 +1,7 @@ angular.module("admin.enterprises") - .controller "changeTypeFormCtrl", ($scope) -> - $scope.sells = "unspecified" - $scope.producer_profile_only = true + .controller "changeTypeFormCtrl", ($scope, enterprise) -> + $scope.sells = enterprise.sells + $scope.producer_profile_only = enterprise.producer_profile_only $scope.submitted = false $scope.valid = (form) -> diff --git a/app/serializers/api/admin/enterprise_serializer.rb b/app/serializers/api/admin/enterprise_serializer.rb index e6d00b7aae..a23764b84a 100644 --- a/app/serializers/api/admin/enterprise_serializer.rb +++ b/app/serializers/api/admin/enterprise_serializer.rb @@ -1,3 +1,4 @@ class Api::Admin::EnterpriseSerializer < ActiveModel::Serializer attributes :name, :id, :is_primary_producer, :is_distributor, :sells, :category, :payment_method_ids, :shipping_method_ids + attributes :producer_profile_only end