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

Insert a 5 minute offset between view and vote queue roll over.

parent 4bb0bdca
Branches
No related tags found
No related merge requests found
...@@ -82,13 +82,22 @@ class ApprovalActionQueue extends ApprovalAction ...@@ -82,13 +82,22 @@ class ApprovalActionQueue extends ApprovalAction
continue; continue;
} }
} }
$year = Zend_Filter_Int::filter($scheduleData['year']);
$month = Zend_Filter_Int::filter($scheduleData['month']);
$day = Zend_Filter_Int::filter($scheduleData['day']);
$hour = Zend_Filter_Int::filter($scheduleData['hour']);
$minute = Zend_Filter_Int::filter($scheduleData['minute']);
$second = Zend_Filter_Int::filter($scheduleData['second']);
$date = new Zend_Date(); $date = new Zend_Date();
$date->setYear($scheduleData['year']); $date->setYear($year);
$date->setMonth($scheduleData['month']); $date->setMonth($month);
$date->setDay($scheduleData['day']); $date->setDay($day);
$date->setHour(0); $date->setHour($hour);
$date->setMinute(0); $date->setMinute($minute);
$date->setSecond(0); $date->setSecond($second);
$schedule->date = $date; $schedule->date = $date;
$schedule->save(); $schedule->save();
try { try {
......
...@@ -81,6 +81,13 @@ class ApprovalActionVote extends ApprovalActionQueue ...@@ -81,6 +81,13 @@ class ApprovalActionVote extends ApprovalActionQueue
$this->votingRole = ApprovalBodyRoles::getInstance()->findOne($votingRoleId); $this->votingRole = ApprovalBodyRoles::getInstance()->findOne($votingRoleId);
$this->quorum = Zend_Filter_Int::filter($formData['quorum']); $this->quorum = Zend_Filter_Int::filter($formData['quorum']);
if (is_array($formData['schedule'])) {
foreach ($formData['schedule'] as $scheduleId => $scheduleData) {
$formData['schedule'][$scheduleId]['hour'] = 0;
$formData['schedule'][$scheduleId]['minute'] = 5;
}
}
parent::updateFromForm($formData); parent::updateFromForm($formData);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment