From 0d2eff839d38ba488195cd9460b22683c77a7421 Mon Sep 17 00:00:00 2001 From: Samuel Date: Tue, 20 May 2025 09:17:00 +0100 Subject: [PATCH] don't show inactive users on assignment boxes --- app/models/form/lettings/questions/created_by_id.rb | 3 ++- app/models/form/sales/questions/created_by_id.rb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/models/form/lettings/questions/created_by_id.rb b/app/models/form/lettings/questions/created_by_id.rb index ea6375152..5459c1956 100644 --- a/app/models/form/lettings/questions/created_by_id.rb +++ b/app/models/form/lettings/questions/created_by_id.rb @@ -28,7 +28,8 @@ class Form::Lettings::Questions::CreatedById < ::Form::Question end), ].flatten else - current_user.organisation.users.visible + # ensure data coordinators can't assign a log to an inactive user + current_user.organisation.users.visible.active_status end.uniq.compact users.each_with_object(ANSWER_OPTS.dup) do |user, hsh| diff --git a/app/models/form/sales/questions/created_by_id.rb b/app/models/form/sales/questions/created_by_id.rb index 516afd2bc..2171d2f4b 100644 --- a/app/models/form/sales/questions/created_by_id.rb +++ b/app/models/form/sales/questions/created_by_id.rb @@ -25,7 +25,8 @@ class Form::Sales::Questions::CreatedById < ::Form::Question end), ].flatten else - log.managing_organisation.users.visible + # ensure data coordinators can't assign a log to an inactive user + log.managing_organisation.users.visible.active_status end.uniq.compact users.each_with_object(ANSWER_OPTS.dup) do |user, hsh| hsh[user.id] = present_user(user)