Browse Source

All the things are green

pull/674/head
baarkerlounger 3 years ago
parent
commit
7fdd6260f3
  1. 8
      app/controllers/case_logs_controller.rb
  2. 2
      app/models/form/setup/pages/organisation.rb
  3. 4
      app/models/form/setup/questions/owning_organisation_id.rb
  4. 6
      spec/models/form/setup/questions/owning_organisation_id_spec.rb

8
app/controllers/case_logs_controller.rb

@ -29,11 +29,13 @@ class CaseLogsController < ApplicationController
def create def create
case_log = CaseLog.new(case_log_params) case_log = CaseLog.new(case_log_params)
case_log.form.current_user = current_user case_log.form.current_user = current_user
case_log.save
respond_to do |format| respond_to do |format|
format.html { redirect_to case_log } format.html do
case_log.save!
redirect_to case_log
end
format.json do format.json do
if case_log.persisted? if case_log.save
render json: case_log, status: :created render json: case_log, status: :created
else else
render json: { errors: case_log.errors.messages }, status: :unprocessable_entity render json: { errors: case_log.errors.messages }, status: :unprocessable_entity

2
app/models/form/setup/pages/organisation.rb

@ -18,7 +18,7 @@ class Form::Setup::Pages::Organisation < ::Form::Page
!!form.current_user&.support? !!form.current_user&.support?
end end
def invalidated?(case_log) def invalidated?(_case_log)
false false
end end
end end

4
app/models/form/setup/questions/owning_organisation_id.rb

@ -11,8 +11,8 @@ class Form::Setup::Questions::OwningOrganisationId < ::Form::Question
end end
def answer_options_values def answer_options_values
hsh = { "" => "Select an option" } answer_opts = { "" => "Select an option" }
Organisation.all.each_with_object(hsh) do |organisation, hsh| Organisation.all.each_with_object(answer_opts) do |organisation, hsh|
hsh[organisation.id] = organisation.name hsh[organisation.id] = organisation.name
hsh hsh
end end

6
spec/models/form/setup/questions/owning_organisation_id_spec.rb

@ -12,9 +12,9 @@ RSpec.describe Form::Setup::Questions::OwningOrganisationId, type: :model do
let!(:organisation_2) { FactoryBot.create(:organisation, name: "second test org") } let!(:organisation_2) { FactoryBot.create(:organisation, name: "second test org") }
let(:expected_answer_options) do let(:expected_answer_options) do
{ {
"" => "Select an option", "" => "Select an option",
organisation_1.id => organisation_1.name, organisation_1.id => organisation_1.name,
organisation_2.id => organisation_2.name, organisation_2.id => organisation_2.name,
} }
end end

Loading…
Cancel
Save