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

Basic support for allowing users to change their votes in Queue/Vote actions

parent ef4dce88
No related branches found
No related tags found
No related merge requests found
...@@ -78,9 +78,11 @@ class Requests_ApprovalActionQueueModel extends Requests_ApprovalActionModel ...@@ -78,9 +78,11 @@ class Requests_ApprovalActionQueueModel extends Requests_ApprovalActionModel
$user = Auth_UserModel::findCurrentUser(); $user = Auth_UserModel::findCurrentUser();
$votes = Requests_ApproverVoteModel::findUsersVotesForRequsets($user, $requests); $votes = Requests_ApproverVoteModel::findUsersVotesForRequsets($user, $requests);
foreach ($requests as $request) { foreach ($requests as $request) {
if ($votes[$request->getId()]) { if ($votes[$request->getId()] && $votes[$request->getId()]->getApprovalAction() == $this->getId()) {
$vote = $votes[$request->getId()]; $vote = $votes[$request->getId()];
if (!$this->getCanChangeVote()) {
continue; continue;
}
} else { } else {
$vote = Requests_ApproverVoteModel::fetchNew(); $vote = Requests_ApproverVoteModel::fetchNew();
} }
...@@ -98,5 +100,10 @@ class Requests_ApprovalActionQueueModel extends Requests_ApprovalActionModel ...@@ -98,5 +100,10 @@ class Requests_ApprovalActionQueueModel extends Requests_ApprovalActionModel
{ {
// Do nothing in base class, useful for overriding in child classes // Do nothing in base class, useful for overriding in child classes
} }
public function getCanChangeVote()
{
return (bool) ($this->_data['canChangeVote'] == 'yes');
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment