This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 12d8b01f07383926182f88855290f5afe4680af4 (commit)
from c8a571d578897ccf07c92706c31d200affd7586b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=12d8b01f07383926182f88855290f5afe4680af4
commit 12d8b01f07383926182f88855290f5afe4680af4
Author: Franck Villaume <[email protected]>
Date: Thu Mar 9 19:00:33 2017 +0100
fix last comment on review validation/closing
diff --git a/src/common/docman/actions/editfile.php
b/src/common/docman/actions/editfile.php
index 70a9cb6..34beafc 100644
--- a/src/common/docman/actions/editfile.php
+++ b/src/common/docman/actions/editfile.php
@@ -210,6 +210,7 @@ switch ($subaction) {
$reviewnotificationcomment =
getStringFromRequest('review-notificationcomment');
$remindernotification =
getStringFromRequest('review-remindernotification');
if ($reviewversionserialid) {
+ $now = time();
if ($new_review) {
$dr = new DocumentReview($d);
if ($dr->create($reviewversionserialid,
$reviewtitle, $reviewdescription, $reviewenddate, $reviewmandatoryusers,
$reviewoptionalusers, $reviewnotificationcomment)) {
@@ -235,7 +236,6 @@ switch ($subaction) {
}
$dr = new DocumentReview($d, $reviewid);
$drc = new DocumentReviewComment($dr);
- $now = time();
if ($drc->create(user_getid(), $reviewid,
$reviewcomment, $now)) {
if ($reviewdone) {
$dr->setUserDone(user_getid(),
$now);
@@ -263,7 +263,8 @@ switch ($subaction) {
$dr = new DocumentReview($d, $reviewid);
if ($reviewcompletedchecked) {
if (strlen($reviewconclusioncomment) >
0) {
- $reviewdescription =
$reviewconclusioncomment;
+ $drc = new
DocumentReviewComment($dr);
+ $drc->create(user_getid(),
$reviewid, $reviewconclusioncomment, $now);
}
if ($dr->close($reviewversionserialid,
$reviewtitle, $reviewdescription, $reviewfinalstatus, $reviewvalidatedocument,
$reviewcurrentversion)) {
$feedback = _('Review closed
successfully');
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/actions/editfile.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
