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 cebaa5ba44f3110aef8c9012a30fce4d75d72aa8 (commit)
from fa09bd92ab87420bf32ad1630d33a5792fe4d3ad (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=cebaa5ba44f3110aef8c9012a30fce4d75d72aa8
commit cebaa5ba44f3110aef8c9012a30fce4d75d72aa8
Author: Franck Villaume <[email protected]>
Date: Sun Feb 12 23:11:22 2017 +0100
document review: implement reminder notification comment
diff --git a/src/common/docman/DocumentReview.class.php
b/src/common/docman/DocumentReview.class.php
index 7753338..3745ef5 100644
--- a/src/common/docman/DocumentReview.class.php
+++ b/src/common/docman/DocumentReview.class.php
@@ -332,6 +332,7 @@ class DocumentReview extends FFError {
$return .= html_e('div', array('id' =>
'editfile-userstatusreview'), '', false);
$return .= html_e('div', array('id' =>
'editfile-completedreview'), '', false);
$return .= html_e('div', array('id' =>
'editfile-commentreview'), '', false);
+ $return .= html_e('div', array('id' =>
'editfile-remindernotification', 'style' => 'display:none'), _('Notification
reminder comment')._(':').html_e('textarea', array('id' =>
'review-remindernotification', 'name' => 'review-remindernotification', 'style'
=> 'width: 100%; box-sizing: border-box;', 'rows' => 3), '', false));
$javascript =
'jQuery("#datepicker_end_review_date").datepicker({dateFormat:
"'.$date_format_js.'"});';
$return .= html_e('script', array(
'type'=>'text/javascript', 'id' => 'editfile-datepickerreview-script'),
'//<![CDATA['."\n".$javascript."\n".'//]]>');
} else {
diff --git a/src/common/docman/actions/editfile.php
b/src/common/docman/actions/editfile.php
index 6aa8dc3..70a9cb6 100644
--- a/src/common/docman/actions/editfile.php
+++ b/src/common/docman/actions/editfile.php
@@ -208,6 +208,7 @@ switch ($subaction) {
$reviewcomment = $sanitizer->SanitizeHtml($reviewcomment);
$reviewdone = getIntFromRequest('review-done');
$reviewnotificationcomment =
getStringFromRequest('review-notificationcomment');
+ $remindernotification =
getStringFromRequest('review-remindernotification');
if ($reviewversionserialid) {
if ($new_review) {
$dr = new DocumentReview($d);
@@ -246,6 +247,18 @@ switch ($subaction) {
} else {
$error_msg = $drc->getErrorMessage();
}
+ } elseif ($remindernotification) {
+ $dr = new DocumentReview($d, $reviewid);
+ if ($dr && !$dr->isError()) {
+ $users = $dr->getUsers(array(1));
+ if ($dr->sendNotice($users, false,
$remindernotification)) {
+ $feedback = _('Reminder sent
successfully.');
+ } else {
+ $error_msg = _('No reminder
sent for review ID')._(': ').$reviewid;
+ }
+ } else {
+ $error_msg = _('Cannot create object
documentreview');
+ }
} else {
$dr = new DocumentReview($d, $reviewid);
if ($reviewcompletedchecked) {
diff --git a/src/common/docman/actions/reminderreview.php
b/src/common/docman/actions/reminderreview.php
deleted file mode 100644
index 55118cb..0000000
--- a/src/common/docman/actions/reminderreview.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * FusionForge Documentation Manager
- *
- * Copyright 2016, Franck Villaume - TrivialDev
- * http://fusionforge.org
- *
- * This file is part of FusionForge. FusionForge is free software;
- * you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the Licence, or (at your option)
- * any later version.
- *
- * FusionForge is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with FusionForge; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-/* please do not add require here : use www/docman/index.php to add require */
-/* global variables used */
-global $g; // Group object
-global $group_id; // id of group
-global $HTML;
-
-$sysdebug_enable = false;
-$result = array();
-$result['status'] = 0;
-
-if (!forge_check_perm('docman', $group_id, 'approve')) {
- $result['html'] = $HTML->error_msg(_('Document Manager Action
Denied.'));
- echo json_encode($result);
- exit;
-}
-
-$docid = getIntFromRequest('docid');
-$review = getIntFromRequest('review');
-
-if ($docid && $review) {
- $documentObject = document_get_object($docid, $group_id);
- if ($documentObject && !$documentObject->isError()) {
- $dr = new DocumentReview($documentObject, $review);
- if ($dr && !$dr->isError()) {
- $users = $dr->getUsers(array(1));
- if ($dr->sendNotice($users)) {
- $result['html'] = $HTML->feedback(_('Reminder
sent successfully.'));
- } else {
- $result['html'] = $HTML->error_msg(_('No
reminder sent for review ID')._(': ').$review);
- }
- } else {
- $result['html'] = $HTML->error_msg(_('Cannot create
object documentreview'));
- }
- } else {
- $result['html'] = $HTML->error_msg(_('Cannot retrieve
document')._(': ').$docid);
- }
-} else {
- $result['html'] = $HTML->warning_msg(_('No document ID. Cannot retrieve
review.'));
-}
-
-echo json_encode($result);
-exit;
diff --git a/src/www/docman/scripts/DocManController.js
b/src/www/docman/scripts/DocManController.js
index abe39b1..47d3d1f 100644
--- a/src/www/docman/scripts/DocManController.js
+++ b/src/www/docman/scripts/DocManController.js
@@ -542,6 +542,8 @@ DocManListFileController.prototype =
jQuery('#editfile-userstatusreview').empty();
jQuery('#editfile-completedreview').empty();
jQuery('#editfile-commentreview').empty();
+ jQuery('#editfile-remindernotification').hide();
+ jQuery('#review-remindernotification').val('');
if (jQuery('#editfile-createreview').is(':visible')) {
jQuery('#editfile-createreview').hide();
jQuery('#new_review').val(0);
@@ -556,6 +558,8 @@ DocManListFileController.prototype =
this.review = params;
jQuery('#editfile-commentreview').empty();
jQuery('#review_newcomment').val(0);
+ jQuery('#editfile-remindernotification').hide();
+ jQuery('#review-remindernotification').val('');
if (jQuery('#editfile-createreview').is(':visible')) {
jQuery('#editfile-createreview').hide();
jQuery('#new_review').val(0);
@@ -610,6 +614,8 @@ DocManListFileController.prototype =
jQuery('#review_id').val(this.comment.review);
jQuery('#editfile-userstatusreview').empty();
jQuery('#editfile-completedreview').empty();
+ jQuery('#editfile-remindernotification').hide();
+ jQuery('#review-remindernotification').val('');
jQuery.getJSON(this.listfileparams.docManURL + '/?group_id=' +
this.comment.groupId +
'&action=getdocreviewcomments&docid='+this.comment.docid+'&revid='+this.comment.review
, jQuery.proxy(function(data){
jQuery('#editfile-commentreview').empty();
if (typeof data.html != 'undefined') {
@@ -716,6 +722,8 @@ DocManListFileController.prototype =
jQuery('#review_complete').val(0);
jQuery('#editfile-userstatusreview').empty();
jQuery('#editfile-completedreview').empty();
+ jQuery('#editfile-remindernotification').hide();
+ jQuery('#review-remindernotification').val('');
jQuery.getJSON(this.docparams.docManURL + '/?group_id=' +
this.docparams.groupId +
'&action=deletereview&docid='+this.docparams.id+'&review='+this.delreview.review
, jQuery.proxy(function(data){
if (typeof data.html != 'undefined') {
jQuery('#editFile >
.feedback').remove();
@@ -734,14 +742,17 @@ DocManListFileController.prototype =
reminderReview: function(params) {
this.reminderreview = params;
- jQuery.getJSON(this.docparams.docManURL + '/?group_id=' +
this.docparams.groupId +
'&action=reminderreview&docid='+this.docparams.id+'&review='+this.reminderreview.review
, jQuery.proxy(function(data){
- if (typeof data.html != 'undefined') {
- jQuery('#editFile >
.feedback').remove();
- jQuery('#editFile > .error').remove();
- jQuery('#editFile >
.warning_msg').remove();
- jQuery('#editFile').prepend(data.html);
- }
- }, this.reminderreview));
+ if (jQuery('#editfile-remindernotification').is(':visible')) {
+ jQuery('#editfile-remindernotification').hide();
+ jQuery('#review-remindernotification').val('');
+ } else {
+ jQuery('#new_review').val(0);
+ jQuery('#editfile-createreview').hide();
+ jQuery('#editfile-commentreview').empty();
+ jQuery('#editfile-userstatusreview').empty();
+ jQuery('#editfile-completedreview').empty();
+ jQuery('#editfile-remindernotification').show();
+ }
},
toggleMoveFileView: function() {
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/DocumentReview.class.php | 1 +
src/common/docman/actions/editfile.php | 13 ++++++
src/common/docman/actions/reminderreview.php | 65 ----------------------------
src/www/docman/scripts/DocManController.js | 27 ++++++++----
4 files changed, 33 insertions(+), 73 deletions(-)
delete mode 100644 src/common/docman/actions/reminderreview.php
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
