Render enterprise relationships JSON with AMS instead of rabl

This commit is contained in:
Rohan Mitchell
2014-08-25 13:07:31 +10:00
parent 3524e658f8
commit cb615ba994
6 changed files with 18 additions and 18 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -1,2 +0,0 @@
collection @enterprise_relationships
extends "admin/json/enterprise_relationship"