From 64df4194ba6c95ef6153870f318de926be639aa0 Mon Sep 17 00:00:00 2001 From: Kat Date: Thu, 10 Nov 2022 16:45:28 +0000 Subject: [PATCH] refactor --- app/controllers/locations_controller.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/controllers/locations_controller.rb b/app/controllers/locations_controller.rb index f55f79ed3..87a3ea566 100644 --- a/app/controllers/locations_controller.rb +++ b/app/controllers/locations_controller.rb @@ -22,15 +22,9 @@ class LocationsController < ApplicationController def deactivate if params[:location][:confirm].present? && params[:location][:deactivation_date].present? - if @location.update(deactivation_date: params[:location][:deactivation_date]) - # update the logs - flash[:notice] = "#{@location.name} has been deactivated" - end - redirect_to scheme_locations_path(@scheme) + confirm_deactivation else - deactivation_date_errors - if @location.errors.present? @location.deactivation_date_type = params[:location][:deactivation_date_type] render "toggle_active", locals: { action: "deactivate" }, status: :unprocessable_entity @@ -168,7 +162,14 @@ private location_params["location_admin_district"] != "Select an option" end - + def confirm_deactivation + if @location.update(deactivation_date: params[:location][:deactivation_date]) + # update the logs + flash[:notice] = "#{@location.name} has been deactivated" + end + redirect_to scheme_locations_path(@scheme) + return + end def deactivation_date_errors if params[:location][:deactivation_date].blank? && params[:location][:deactivation_date_type].blank? @@ -194,7 +195,6 @@ private end end - def deactivation_date return if params[:location].blank? collection_start_date = FormHandler.instance.current_collection_start_date