From 804b84634549d2ac237bdec6e05cf73db8a285df Mon Sep 17 00:00:00 2001 From: Aidan Feldman Date: Mon, 5 Oct 2015 23:08:18 -0400 Subject: [PATCH] use existing logic to retrieve the current approver on a WorkOrder --- app/models/concerns/proposal_delegate.rb | 2 +- app/models/ncr/work_order.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/concerns/proposal_delegate.rb b/app/models/concerns/proposal_delegate.rb index d8037e9d1..9a81280be 100644 --- a/app/models/concerns/proposal_delegate.rb +++ b/app/models/concerns/proposal_delegate.rb @@ -20,7 +20,7 @@ module ProposalDelegate validates :proposal, presence: true - delegate :add_observer, :add_requester, :set_requester, to: :proposal + delegate :add_observer, :add_requester, :set_requester, :currently_awaiting_approvers, to: :proposal ### delegate the workflow actions/scopes/states ### diff --git a/app/models/ncr/work_order.rb b/app/models/ncr/work_order.rb index c72854fa6..632eb9f1e 100644 --- a/app/models/ncr/work_order.rb +++ b/app/models/ncr/work_order.rb @@ -117,7 +117,7 @@ def approving_official # the highest approver on the stack, pending preferred if status indicates def current_approver_email_address if self.pending? - self.individual_approvals.where(status: 'actionable').first.user.email_address + self.currently_awaiting_approvers.first.email_address else self.approving_official.email_address end