Skip to content
Snippets Groups Projects
Commit 3afc09f1 authored by Tim Steiner's avatar Tim Steiner
Browse files

Prevents some duplicate key errors when voting on something for the second time in the same action.

parent fc303e86
No related branches found
No related tags found
No related merge requests found
......@@ -77,7 +77,7 @@ class Requests_ApprovalActionQueueModel extends Requests_ApprovalActionModel
public function userMadeDecisions($requests, $requestDecisions)
{
$user = Auth_UserModel::findCurrentUser();
$votes = Requests_ApproverVoteModel::findUsersVotesForRequests($user, $requests);
$votes = Requests_ApproverVoteModel::findUsersVotesForRequests($user, $requests, $this);
$requestHistories = Requests_ApprovalHistoryModel::findByRequest($requests);
foreach ($requests as $request) {
$histories = $requestHistories[$request->getId()];
......
......@@ -34,7 +34,7 @@ class Requests_ApproverVoteModel extends Unl_Model
}
}
static public function findUsersVotesForRequests(Auth_UserModel $user, $requests)
static public function findUsersVotesForRequests(Auth_UserModel $user, $requests, $approvalAction = null)
{
$db = Zend_Registry::get('db');
......@@ -49,6 +49,9 @@ class Requests_ApproverVoteModel extends Unl_Model
$select->where('a.request = ?', $requests->getId());
}
$select->where('user = ?', $user->getId());
if ($approvalAction instanceof Requests_ApprovalActionModel) {
$select->where('approvalAction = ?', $approvalAction->getId());
}
$select->order('time');
$records = $db->query($select)->fetchAll();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment