From 60eb274bfb9e7c5fb1f119a7c949946e4e043b2a Mon Sep 17 00:00:00 2001 From: Kat Date: Thu, 14 Oct 2021 11:06:40 +0100 Subject: [PATCH] rubocop --- app/controllers/case_logs_controller.rb | 6 ++++-- app/models/form.rb | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/case_logs_controller.rb b/app/controllers/case_logs_controller.rb index efb2e0be9..0c8ef3a12 100644 --- a/app/controllers/case_logs_controller.rb +++ b/app/controllers/case_logs_controller.rb @@ -1,7 +1,9 @@ class CaseLogsController < ApplicationController skip_before_action :verify_authenticity_token, if: :json_create_request? before_action :authenticate, if: :json_create_request? + # rubocop:disable Style/ClassVars @@form_handler = FormHandler.instance + # rubocop:enable Style/ClassVars def index @submitted_case_logs = CaseLog.where(status: 1) @@ -93,8 +95,8 @@ private return {} unless params[:case_log] params.require(:case_log).permit(CaseLog.editable_fields) - end - + end + def use_form ENV["RAILS_ENV"] == "test" ? @@form_handler.get_form("test_form") : @@form_handler.get_form("2021_2022") end diff --git a/app/models/form.rb b/app/models/form.rb index 902ef6c56..db60b4d93 100644 --- a/app/models/form.rb +++ b/app/models/form.rb @@ -5,7 +5,6 @@ class Form form_json = "config/forms/#{filename}.json" raise "No form definition file exists for given year".freeze unless File.exist?(form_json) - @form_definition = JSON.parse(File.open(form_json).read) end