From b516cf66ef44d3498eba38e1e8d2141d6d75459f Mon Sep 17 00:00:00 2001 From: artoscinote <85488244+artoscinote@users.noreply.github.com> Date: Thu, 31 Mar 2022 14:56:23 +0200 Subject: [PATCH] Hide reminders and disable stock consumption for archived items [SCI-6689] (#3978) --- app/helpers/repository_datatable_helper.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/helpers/repository_datatable_helper.rb b/app/helpers/repository_datatable_helper.rb index d69f4d0f8..95ffec0a4 100644 --- a/app/helpers/repository_datatable_helper.rb +++ b/app/helpers/repository_datatable_helper.rb @@ -244,12 +244,14 @@ module RepositoryDatatableHelper # don't load reminders for archived repositories return [] if repository_rows.blank? || repository.archived? - repository_rows.with_active_reminders(current_user).pluck(:id).uniq + repository_rows.where(archived: false).with_active_reminders(current_user).pluck(:id).uniq end def stock_consumption_managable?(record, repository, my_module) return false unless my_module + return false unless record.repository.is_a?(Repository) + return false if repository.archived? || record.archived? - record.repository.is_a?(Repository) && !repository.archived? && can_update_my_module_stock_consumption?(my_module) + can_update_my_module_stock_consumption?(my_module) end end