From 2ede6577efd79723b531236222bd4716a9137432 Mon Sep 17 00:00:00 2001 From: Kat Date: Wed, 30 Nov 2022 13:26:46 +0000 Subject: [PATCH] Add UnresolvedLogHelper and extract flack notice message --- app/controllers/lettings_logs_controller.rb | 4 +--- app/helpers/unresolved_log_helper.rb | 6 ++++++ 2 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 app/helpers/unresolved_log_helper.rb diff --git a/app/controllers/lettings_logs_controller.rb b/app/controllers/lettings_logs_controller.rb index 366ca267e..0ac6be92c 100644 --- a/app/controllers/lettings_logs_controller.rb +++ b/app/controllers/lettings_logs_controller.rb @@ -118,10 +118,8 @@ private def resolve_logs! if @log&.unresolved == true && @log.location.present? && @log.scheme.present? && @log.update(unresolved: false) - notice_message = "You’ve updated all the fields affected by the scheme change." unresolved_logs_count_for_user = current_user.lettings_logs.unresolved.created_by(current_user).count - notice_message << " Update #{unresolved_logs_count_for_user} more logs" if unresolved_logs_count_for_user.positive? - flash[:notice] = notice_message.html_safe + flash.now[:notice] = helpers.flash_notice_for_resolved_logs(unresolved_logs_count_for_user) end end end diff --git a/app/helpers/unresolved_log_helper.rb b/app/helpers/unresolved_log_helper.rb new file mode 100644 index 000000000..37128852e --- /dev/null +++ b/app/helpers/unresolved_log_helper.rb @@ -0,0 +1,6 @@ +module UnresolvedLogHelper + def flash_notice_for_resolved_logs(count) + notice_message = "You’ve updated all the fields affected by the scheme change.
" + notice_message << " Update #{count} more logs" if count.positive? + end +end