diff --git a/app/controllers/concerns/loads_case_contacts.rb b/app/controllers/concerns/loads_case_contacts.rb index bc50aa1073..c41954789c 100644 --- a/app/controllers/concerns/loads_case_contacts.rb +++ b/app/controllers/concerns/loads_case_contacts.rb @@ -36,6 +36,8 @@ def all_case_contacts policy_scope(current_organization.case_contacts).preload( :creator, :followups, + :contact_topics, + :casa_org, contact_types: :contact_type_group, contact_topic_answers: :contact_topic, casa_case: :volunteers diff --git a/app/datatables/case_contact_datatable.rb b/app/datatables/case_contact_datatable.rb index 7975c16407..34176920c6 100644 --- a/app/datatables/case_contact_datatable.rb +++ b/app/datatables/case_contact_datatable.rb @@ -35,7 +35,7 @@ def data .map { |a| {question: a.contact_topic&.question, value: a.value} }, notes: case_contact.notes.presence, is_draft: !case_contact.active?, - has_followup: case_contact.followups.requested.exists? + has_followup: case_contact.followups.any?(&:requested?) } end end @@ -48,7 +48,7 @@ def raw_records base_relation .joins("INNER JOIN users creators ON creators.id = case_contacts.creator_id") .left_joins(:casa_case) - .includes(:contact_types, :contact_topics, :followups, :creator, contact_topic_answers: :contact_topic) + .includes(:casa_case, :contact_types, :contact_topics, :followups, :creator, contact_topic_answers: :contact_topic) .order(order_clause) .order(:id) end