Browse Source

do not reset created_by and remove user_organisation_chosen?

pull/1055/head
Kat 4 years ago
parent
commit
89e5a63627
  1. 2
      app/controllers/form_controller.rb
  2. 1
      app/models/lettings_log.rb
  3. 18
      app/models/log.rb

2
app/controllers/form_controller.rb

@ -10,7 +10,7 @@ class FormController < ApplicationController
responses_for_page = responses_for_page(@page)
mandatory_questions_with_no_response = mandatory_questions_with_no_response(responses_for_page)
if mandatory_questions_with_no_response.empty? && (@log.user_organisation_chosen?(current_user) || current_user.support?) && @log.update(responses_for_page)
if mandatory_questions_with_no_response.empty? && @log.update(responses_for_page)
session[:errors] = session[:fields] = nil
redirect_to(successful_redirect_path)
else

1
app/models/lettings_log.rb

@ -570,7 +570,6 @@ private
super
reset_invalid_unresolved_log_fields!
reset_created_by
reset_scheme
reset_derived_questions
end

18
app/models/log.rb

@ -44,21 +44,11 @@ class Log < ApplicationRecord
def managing_organisation_provider_type
managing_organisation&.provider_type
end
def collection_period_open?
form.end_date > Time.zone.today
end
def user_organisation_chosen?(user)
unless [user, managing_organisation, owning_organisation].any?(&:blank?) || user.organisation == managing_organisation || user.organisation == owning_organisation
errors.add :created_by, I18n.t("validations.setup.created_by.invalid")
errors.add :owning_organisation_id, I18n.t("validations.setup.owning_organisation.invalid")
errors.add :managing_organisation_id, I18n.t("validations.setup.managing_organisation.invalid")
return false
end
true
end
private
def update_status!
@ -82,12 +72,6 @@ private
subsection_statuses.all? { |status| not_started_statuses.include?(status) }
end
def reset_created_by
return unless created_by && owning_organisation
self.created_by = nil if created_by.organisation != owning_organisation
end
def reset_invalidated_dependent_fields!
return unless form

Loading…
Cancel
Save