From a6877c698118766fd81d088ab0bdd1900f6a8a79 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 16 Oct 2013 10:37:09 +1100
Subject: [PATCH] Only render calculator HTML in enterprise fee JSON if
 explicitly requested. Improves load time of order cycles page.

---
 app/assets/javascripts/admin/enterprise_fees.js     | 2 +-
 app/controllers/admin/enterprise_fees_controller.rb | 2 ++
 app/views/admin/enterprise_fees/index.rep           | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/admin/enterprise_fees.js b/app/assets/javascripts/admin/enterprise_fees.js
index fd0d17a7b1..14e638dc70 100644
--- a/app/assets/javascripts/admin/enterprise_fees.js
+++ b/app/assets/javascripts/admin/enterprise_fees.js
@@ -1,6 +1,6 @@
 angular.module('enterprise_fees', [])
   .controller('AdminEnterpriseFeesCtrl', ['$scope', '$http', function($scope, $http) {
-    $http.get('/admin/enterprise_fees.json').success(function(data) {
+    $http.get('/admin/enterprise_fees.json?include_calculators=1').success(function(data) {
       $scope.enterprise_fees = data;
 
       for(i=0; i<3; i++) {
diff --git a/app/controllers/admin/enterprise_fees_controller.rb b/app/controllers/admin/enterprise_fees_controller.rb
index 3d4acb587e..0b74409ee8 100644
--- a/app/controllers/admin/enterprise_fees_controller.rb
+++ b/app/controllers/admin/enterprise_fees_controller.rb
@@ -6,6 +6,8 @@ module Admin
 
 
     def index
+      @include_calculators = params[:include_calculators].present?
+
       respond_to do |format|
         format.html
         format.json { @presented_collection = @collection.each_with_index.map { |ef, i| EnterpriseFeePresenter.new(self, ef, i) } }
diff --git a/app/views/admin/enterprise_fees/index.rep b/app/views/admin/enterprise_fees/index.rep
index c6bccc5a4e..61192ca786 100644
--- a/app/views/admin/enterprise_fees/index.rep
+++ b/app/views/admin/enterprise_fees/index.rep
@@ -6,5 +6,5 @@ r.list_of :enterprise_fees, @presented_collection do
   r.element :name
   r.element :calculator_type
   r.element :calculator_description
-  r.element :calculator_settings
+  r.element :calculator_settings if @include_calculators
 end