diff --git a/classes/submission/trackDirector/TrackDirectorAction.inc.php b/classes/submission/trackDirector/TrackDirectorAction.inc.php index a148976..744a817 100644 --- a/classes/submission/trackDirector/TrackDirectorAction.inc.php +++ b/classes/submission/trackDirector/TrackDirectorAction.inc.php @@ -1659,8 +1659,9 @@ import('classes.file.PaperFileManager'); /** * Accepts the review assignment on behalf of its reviewer. * @param $reviewId int + * @param $accept boolean */ - function confirmReviewForReviewer($reviewId) { + function confirmReviewForReviewer($reviewId, $accept) { $reviewAssignmentDao =& DAORegistry::getDAO('ReviewAssignmentDAO'); $userDao =& DAORegistry::getDAO('UserDAO'); $user =& Request::getUser(); @@ -1668,12 +1669,12 @@ import('classes.file.PaperFileManager'); $reviewAssignment =& $reviewAssignmentDao->getById($reviewId); $reviewer =& $userDao->getUser($reviewAssignment->getReviewerId(), true); - if (HookRegistry::call('TrackDirectorAction::confirmReviewForReviewer', array(&$reviewAssignment, &$reviewer))) return; + if (HookRegistry::call('TrackDirectorAction::confirmReviewForReviewer', array(&$reviewAssignment, &$reviewer, &$accept))) return; // Only confirm the review for the reviewer if // he has not previously done so. if ($reviewAssignment->getDateConfirmed() == null) { - $reviewAssignment->setDeclined(0); + $reviewAssignment->setDeclined($accept?0:1); $reviewAssignment->setDateConfirmed(Core::getCurrentDate()); $reviewAssignment->stampModified(); $reviewAssignmentDao->updateReviewAssignment($reviewAssignment); @@ -1687,7 +1688,7 @@ import('classes.file.PaperFileManager'); $entry->setUserId($user->getId()); $entry->setDateLogged(Core::getCurrentDate()); $entry->setEventType(PAPER_LOG_REVIEW_ACCEPT_BY_PROXY); - $entry->setLogMessage('log.review.reviewAcceptedByProxy', array('reviewerName' => $reviewer->getFullName(), 'paperId' => $reviewAssignment->getSubmissionId(), 'stage' => $reviewAssignment->getRound(), 'userName' => $user->getFullName())); + $entry->setLogMessage($accept?'log.review.reviewAcceptedByProxy':'log.review.reviewDeclinedByProxy', array('reviewerName' => $reviewer->getFullName(), 'paperId' => $reviewAssignment->getSubmissionId(), 'stage' => $reviewAssignment->getRound(), 'userName' => $user->getFullName())); $entry->setAssocType(LOG_TYPE_REVIEW); $entry->setAssocId($reviewAssignment->getId()); diff --git a/locale/en_US/locale.xml b/locale/en_US/locale.xml index 20e1bf9..d02cc78 100644 --- a/locale/en_US/locale.xml +++ b/locale/en_US/locale.xml @@ -781,6 +781,7 @@ Your server currently supports mbstring: {$supportsMBString}]]> {$reviewerName} has declined the stage {$stage} review for submission {$paperId}. {$reviewerName} has accepted the stage {$stage} review for submission {$paperId}. {$userName} has accepted the stage {$stage} review for submission {$paperId} on behalf of {$reviewerName}. + {$userName} has declined the stage {$stage} review for submission {$paperId} on behalf of {$reviewerName}. The Director, {$userName}, has uploaded a review file for stage {$stage} of submission {$paperId} on behalf of the reviewer, {$reviewerName}. A reviewer file has been uploaded. A director decision ({$decision}) for paper {$paperId} was recorded by {$directorName}. diff --git a/pages/trackDirector/SubmissionEditHandler.inc.php b/pages/trackDirector/SubmissionEditHandler.inc.php index cb62fcf..599b699 100644 --- a/pages/trackDirector/SubmissionEditHandler.inc.php +++ b/pages/trackDirector/SubmissionEditHandler.inc.php @@ -752,7 +752,7 @@ class SubmissionEditHandler extends TrackDirectorHandler { $schedConf =& $request->getSchedConf(); $submission =& $this->submission; - TrackDirectorAction::confirmReviewForReviewer($reviewId); + TrackDirectorAction::confirmReviewForReviewer($reviewId, $accept); $request->redirect(null, null, null, 'submissionReview', $paperId); }