Merge pull request #667 from 18F/approver-method

use existing logic to retrieve the current approver on a WorkOrder
18F · Oct 6, 2015 · d5be8e6 · d5be8e6
2 parents 7b95c8d + 804b846
commit d5be8e6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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