diff --git a/app/controllers/admin/enterprise_relationships_controller.rb b/app/controllers/admin/enterprise_relationships_controller.rb index 212bf3849d..7ef435d7ed 100644 --- a/app/controllers/admin/enterprise_relationships_controller.rb +++ b/app/controllers/admin/enterprise_relationships_controller.rb @@ -10,7 +10,7 @@ module Admin @enterprise_relationship = EnterpriseRelationship.new params[:enterprise_relationship] if @enterprise_relationship.save - render partial: "admin/json/enterprise_relationship", locals: {enterprise_relationship: @enterprise_relationship} + render text: Api::Admin::EnterpriseRelationshipSerializer.new(@enterprise_relationship).to_json else render status: 400, json: {errors: @enterprise_relationship.errors.full_messages.join(', ')} end diff --git a/app/helpers/admin/injection_helper.rb b/app/helpers/admin/injection_helper.rb index 60bc911087..9ce62b2719 100644 --- a/app/helpers/admin/injection_helper.rb +++ b/app/helpers/admin/injection_helper.rb @@ -9,6 +9,10 @@ module Admin admin_inject_json_ams_array("ofn.admin", "all_enterprises", @all_enterprises, Api::Admin::EnterpriseSerializer) end + def admin_inject_enterprise_relationships + admin_inject_json_ams_array "ofn.admin", "enterprise_relationships", @enterprise_relationships, Api::Admin::EnterpriseRelationshipSerializer + end + def admin_inject_enterprise_roles admin_inject_json_ams_array "ofn.admin", "enterpriseRoles", @enterprise_roles, Api::Admin::EnterpriseRoleSerializer end diff --git a/app/serializers/api/admin/enterprise_relationship_serializer.rb b/app/serializers/api/admin/enterprise_relationship_serializer.rb new file mode 100644 index 0000000000..708920d8f5 --- /dev/null +++ b/app/serializers/api/admin/enterprise_relationship_serializer.rb @@ -0,0 +1,11 @@ +class Api::Admin::EnterpriseRelationshipSerializer < ActiveModel::Serializer + attributes :id, :parent_id, :parent_name, :child_id, :child_name + + def parent_name + object.parent.name + end + + def child_name + object.child.name + end +end diff --git a/app/views/admin/enterprise_relationships/_data.html.haml b/app/views/admin/enterprise_relationships/_data.html.haml index 7c13978e90..b6f7215afc 100644 --- a/app/views/admin/enterprise_relationships/_data.html.haml +++ b/app/views/admin/enterprise_relationships/_data.html.haml @@ -1,4 +1,2 @@ -:javascript - angular.module('ofn.admin').value('enterprise_relationships', #{render partial: "admin/json/enterprise_relationships", object: @enterprise_relationships}); - angular.module('ofn.admin').value('my_enterprises', #{render partial: "admin/json/enterprises", object: @my_enterprises}); - angular.module('ofn.admin').value('all_enterprises', #{render partial: "admin/json/enterprises", object: @all_enterprises}); += admin_inject_enterprise_relationships += admin_inject_enterprises diff --git a/app/views/admin/json/_enterprise_relationship.rabl b/app/views/admin/json/_enterprise_relationship.rabl deleted file mode 100644 index 9be152ec5c..0000000000 --- a/app/views/admin/json/_enterprise_relationship.rabl +++ /dev/null @@ -1,11 +0,0 @@ -object @enterprise_relationship - -attributes :id, :parent_id, :child_id - -node :parent_name do |enterprise_relationship| - enterprise_relationship.parent.name -end - -node :child_name do |enterprise_relationship| - enterprise_relationship.child.name -end diff --git a/app/views/admin/json/_enterprise_relationships.rabl b/app/views/admin/json/_enterprise_relationships.rabl deleted file mode 100644 index aad55b9770..0000000000 --- a/app/views/admin/json/_enterprise_relationships.rabl +++ /dev/null @@ -1,2 +0,0 @@ -collection @enterprise_relationships -extends "admin/json/enterprise_relationship"