summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2014-02-22 11:12:06 -0700
committermo khan <mo@mokhan.ca>2014-02-22 11:12:06 -0700
commitef7eeb8ed18092bde97ebc30d249d32e56d5645f (patch)
tree28b6d98b366230ee1a0e559272ffee18d38c9b3f /app/controllers
parent64d63822a09d674d1257759b593a562711305d75 (diff)
found a weird bug with jbuilder and trying to render the location json node.
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/application_controller.rb1
-rw-r--r--app/controllers/v1/licenses_controller.rb2
2 files changed, 0 insertions, 3 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1b2f9f7..424262c 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -5,7 +5,6 @@ class ApplicationController < ActionController::Base
before_filter :load_additional_payload_data
rescue_from StandardError, with: :return_server_error
-
def load_additional_payload_data
@license_statuses = LicenseStatus::ALL
@well_types = WellType::ALL
diff --git a/app/controllers/v1/licenses_controller.rb b/app/controllers/v1/licenses_controller.rb
index c62c78b..8966100 100644
--- a/app/controllers/v1/licenses_controller.rb
+++ b/app/controllers/v1/licenses_controller.rb
@@ -5,12 +5,10 @@ class V1::LicensesController < ApplicationController
def index
@licenses = License.most_recent(page: @page, per_page: @per_page)
- render json: @licenses
end
def show
@license = License.find(params[:id])
- render json: @license
end
private