From 8bc9def6ae70f5d0e70ae4b42a2e0dad0f835962 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 15 Aug 2014 11:50:49 +1000
Subject: [PATCH] Switch to AMS for enterprise role serialisation

---
 .../admin/services/enterprise_roles.js.coffee         |  4 ++--
 app/helpers/admin/injection_helper.rb                 |  6 +++++-
 .../api/admin/enterprise_role_serializer.rb           | 11 +++++++++++
 app/views/admin/enterprise_roles/_data.html.haml      |  3 +--
 app/views/admin/json/_enterprise_role.rabl            | 11 -----------
 app/views/admin/json/_enterprise_roles.rabl           |  2 --
 6 files changed, 19 insertions(+), 18 deletions(-)
 create mode 100644 app/serializers/api/admin/enterprise_role_serializer.rb
 delete mode 100644 app/views/admin/json/_enterprise_role.rabl
 delete mode 100644 app/views/admin/json/_enterprise_roles.rabl

diff --git a/app/assets/javascripts/admin/services/enterprise_roles.js.coffee b/app/assets/javascripts/admin/services/enterprise_roles.js.coffee
index 9ff49ad7fe..ca11ab33c6 100644
--- a/app/assets/javascripts/admin/services/enterprise_roles.js.coffee
+++ b/app/assets/javascripts/admin/services/enterprise_roles.js.coffee
@@ -1,9 +1,9 @@
-angular.module("ofn.admin").factory 'EnterpriseRoles', ($http, enterprise_roles) ->
+angular.module("ofn.admin").factory 'EnterpriseRoles', ($http, enterpriseRoles) ->
   new class EnterpriseRoles
     create_errors: ""
 
     constructor: ->
-      @enterprise_roles = enterprise_roles
+      @enterprise_roles = enterpriseRoles
 
     create: (user_id, enterprise_id) ->
       $http.post('/admin/enterprise_roles', {enterprise_role: {user_id: user_id, enterprise_id: enterprise_id}}).success (data, status) =>
diff --git a/app/helpers/admin/injection_helper.rb b/app/helpers/admin/injection_helper.rb
index 481e7912c6..7ded0cc18a 100644
--- a/app/helpers/admin/injection_helper.rb
+++ b/app/helpers/admin/injection_helper.rb
@@ -4,6 +4,10 @@ module Admin
       admin_inject_json_ams "admin.enterprises", "enterprise", @enterprise, Api::Admin::EnterpriseSerializer
     end
 
+    def admin_inject_enterprise_roles
+      admin_inject_json_ams_array "ofn.admin", "enterpriseRoles", @enterprise_roles, Api::Admin::EnterpriseRoleSerializer
+    end
+
     def admin_inject_payment_methods
       admin_inject_json_ams_array "admin.payment_methods", "paymentMethods", @payment_methods, Api::Admin::IdNameSerializer
     end
@@ -30,4 +34,4 @@ module Admin
       render partial: "admin/json/injection_ams", locals: {ngModule: ngModule, name: name, json: json}
     end
   end
-end
\ No newline at end of file
+end
diff --git a/app/serializers/api/admin/enterprise_role_serializer.rb b/app/serializers/api/admin/enterprise_role_serializer.rb
new file mode 100644
index 0000000000..3b5f889f8c
--- /dev/null
+++ b/app/serializers/api/admin/enterprise_role_serializer.rb
@@ -0,0 +1,11 @@
+class Api::Admin::EnterpriseRoleSerializer < ActiveModel::Serializer
+  attributes :id, :user_id, :enterprise_id, :user_email, :enterprise_name
+
+  def user_email
+    object.user.email
+  end
+
+  def enterprise_name
+    object.enterprise.name
+  end
+end
diff --git a/app/views/admin/enterprise_roles/_data.html.haml b/app/views/admin/enterprise_roles/_data.html.haml
index 3c4003a2f0..b68cff2cb7 100644
--- a/app/views/admin/enterprise_roles/_data.html.haml
+++ b/app/views/admin/enterprise_roles/_data.html.haml
@@ -1,2 +1 @@
-:javascript
-  angular.module('ofn.admin').value('enterprise_roles', #{render partial: "admin/json/enterprise_roles", object: @enterprise_roles});
+= admin_inject_enterprise_roles
diff --git a/app/views/admin/json/_enterprise_role.rabl b/app/views/admin/json/_enterprise_role.rabl
deleted file mode 100644
index c5836e35e4..0000000000
--- a/app/views/admin/json/_enterprise_role.rabl
+++ /dev/null
@@ -1,11 +0,0 @@
-object @enterprise_role
-
-attributes :id, :user_id, :enterprise_id
-
-node :user_email do |enterprise_role|
-  enterprise_role.user.email
-end
-
-node :enterprise_name do |enterprise_role|
-  enterprise_role.enterprise.name
-end
diff --git a/app/views/admin/json/_enterprise_roles.rabl b/app/views/admin/json/_enterprise_roles.rabl
deleted file mode 100644
index 3fb82fdca8..0000000000
--- a/app/views/admin/json/_enterprise_roles.rabl
+++ /dev/null
@@ -1,2 +0,0 @@
-collection @enterprise_roles
-extends "admin/json/enterprise_role"