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 cb15f0f6c47250cd7247b5b1929a299b06695a74 (commit)
from 565ad9f70ef3d78eb311ddc44f57db11e8eaa8bf (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=cb15f0f6c47250cd7247b5b1929a299b06695a74
commit cb15f0f6c47250cd7247b5b1929a299b06695a74
Author: Franck Villaume <[email protected]>
Date: Thu Mar 9 19:14:45 2017 +0100
fix document review: notify users, comment is optional
diff --git a/src/common/docman/actions/editfile.php
b/src/common/docman/actions/editfile.php
index 34beafc..3cc55d2 100644
--- a/src/common/docman/actions/editfile.php
+++ b/src/common/docman/actions/editfile.php
@@ -211,7 +211,7 @@ switch ($subaction) {
$remindernotification =
getStringFromRequest('review-remindernotification');
if ($reviewversionserialid) {
$now = time();
- if ($new_review) {
+ if ($new_review == 1) {
$dr = new DocumentReview($d);
if ($dr->create($reviewversionserialid,
$reviewtitle, $reviewdescription, $reviewenddate, $reviewmandatoryusers,
$reviewoptionalusers, $reviewnotificationcomment)) {
$feedback = _('Review created');
@@ -247,7 +247,7 @@ switch ($subaction) {
} else {
$error_msg = $drc->getErrorMessage();
}
- } elseif ($remindernotification) {
+ } elseif ($new_review == 2) {
$dr = new DocumentReview($d, $reviewid);
if ($dr && !$dr->isError()) {
$users = $dr->getUsers(array(1));
diff --git a/src/www/docman/scripts/DocManController.js
b/src/www/docman/scripts/DocManController.js
index 931230f..aa493f6 100644
--- a/src/www/docman/scripts/DocManController.js
+++ b/src/www/docman/scripts/DocManController.js
@@ -805,7 +805,7 @@ DocManListFileController.prototype =
jQuery('#editfile-remindernotification').hide();
jQuery('#review-remindernotification').val('');
} else {
- jQuery('#new_review').val(0);
+ jQuery('#new_review').val(2);
jQuery('#editfile-createreview').hide();
jQuery('#editfile-commentreview').empty();
jQuery('#editfile-userstatusreview').empty();
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/actions/editfile.php | 4 ++--
src/www/docman/scripts/DocManController.js | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
