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 8f0ee5bb983cfc3bdb6fa5aa0cf2e3b122f5f322 (commit)
via e6a724b03a7ab392d8243f503dd26fb8df34e4c4 (commit)
from ddcf8f30f6e2012c49ac9dd1913825507d643383 (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=8f0ee5bb983cfc3bdb6fa5aa0cf2e3b122f5f322
commit 8f0ee5bb983cfc3bdb6fa5aa0cf2e3b122f5f322
Author: Franck Villaume <[email protected]>
Date: Sun Dec 11 17:34:44 2016 +0100
support final comment on closing review
diff --git a/src/common/docman/DocumentReview.class.php
b/src/common/docman/DocumentReview.class.php
index cbecad0..0526228 100644
--- a/src/common/docman/DocumentReview.class.php
+++ b/src/common/docman/DocumentReview.class.php
@@ -243,6 +243,16 @@ class DocumentReview extends FFError {
$cells[] = array(_('Close the review')._(':'), 'style' =>
'width: 30%;');
$cells[][] = html_e('input', array('type' => 'checkbox', 'name'
=> 'review-completedchecked', 'value' => 1));
$return .= $HTML->multiTableRow(array(), $cells);
+ if ($this->Document->getStateID() == 3) {
+ $cells = array();
+ $cells[][] = _('Validate the document?')._(':');
+ $cells[][] = html_e('input', array('type' =>
'checkbox', 'name' => 'review-validatedocument', 'value' => 1));
+ $return .= $HTML->multiTableRow(array(), $cells);
+ }
+ $cells = array();
+ $cells[][] = _('Conclusion Comment')._(':');
+ $cells[][] = html_e('textarea', array('id' =>
'review-completedcomment', 'name' => 'review-completedcomment', 'style' =>
'width: 100%; box-sizing: border-box;', 'rows' => 3, 'required' => 'required',
'pattern' => '.{10,}', 'placeholder' => _('Description').' '.sprintf(_('(at
least %s characters)'), DOCMAN__REVIEW_DESCRIPTION_MIN_SIZE), 'maxlength' =>
DOCMAN__REVIEW_DESCRIPTION_MAX_SIZE), '', false);
+ $return .= $HTML->multiTableRow(array(), $cells);
$return .= $HTML->listTableBottom();
$return .= html_ac(html_ap() -1);
return $return;
@@ -284,11 +294,11 @@ class DocumentReview extends FFError {
$cells = array();
$cells[][] =_('Add mandatory
reviewers').utils_requiredField()._(':');
$cells[][] = html_e('p', array(),
html_build_multiple_select_box_from_arrays($userIDArray, $userNameArray,
'review-select-mandatory-users[]', array(), 8, false, 'none', false, array('id'
=> 'review-select-mandatory-users')));
- $return .= $HTML->multiTableRow(array(), $cells);
+ $return .= $HTML->multiTableRow(array('id' =>
'tr-mandatory-reviewers'), $cells);
$cells = array();
$cells[][] = _('Add optional reviewers')._(':');
$cells[][] = html_e('p', array(),
html_build_multiple_select_box_from_arrays($userIDArray, $userNameArray,
'review-select-optional-users[]', array(), 8, false, 'none', false, array('id'
=> 'review-select-optional-users')));
- $return .= $HTML->multiTableRow(array(), $cells);
+ $return .= $HTML->multiTableRow(array('id' =>
'tr-optional-reviewers'), $cells);
$cells = array();
$return .= $HTML->listTableBottom();
$return .= $HTML->addRequiredFieldsInfoBox();
diff --git a/src/common/docman/actions/editfile.php
b/src/common/docman/actions/editfile.php
index 2e65a04..24b468c 100644
--- a/src/common/docman/actions/editfile.php
+++ b/src/common/docman/actions/editfile.php
@@ -195,6 +195,7 @@ switch ($subaction) {
$new_review = getIntFromRequest('new_review');
$reviewid = getIntFromRequest('review_id');
$reviewcompletedchecked =
getIntFromRequest('review-completedchecked');
+ $reviewconclusioncomment =
getStringFromRequest('review-completedcomment', '');
if ($reviewversionserialid) {
if ($new_review) {
$dr = new DocumentReview($d);
@@ -206,6 +207,9 @@ switch ($subaction) {
} else {
$dr = new DocumentReview($d, $reviewid);
if ($reviewcompletedchecked) {
+ if (strlen($reviewconclusioncomment) >
0) {
+ $reviewdescription =
$reviewconclusioncomment;
+ }
if ($dr->close($reviewversionserialid,
$reviewtitle, $reviewdescription)) {
$feedback = _('Review closed
successfully');
} else {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=e6a724b03a7ab392d8243f503dd26fb8df34e4c4
commit e6a724b03a7ab392d8243f503dd26fb8df34e4c4
Author: Franck Villaume <[email protected]>
Date: Sun Dec 11 17:33:29 2016 +0100
fix display reviewers rows
diff --git a/src/www/docman/scripts/DocManController.js
b/src/www/docman/scripts/DocManController.js
index c9ca524..3fc9717 100644
--- a/src/www/docman/scripts/DocManController.js
+++ b/src/www/docman/scripts/DocManController.js
@@ -556,8 +556,9 @@ DocManListFileController.prototype =
jQuery('#review-description').val(this.review.description);
jQuery('#datepicker_end_review_date').val(this.review.endreviewdate);
jQuery('#review-serialid').val(this.review.serialid);
- jQuery('[class^=gentle]').remove();
if (this.review.complete) {
+ jQuery('#tr-mandatory-reviewers').hide();
+ jQuery('#tr-optional-reviewers').hide();
jQuery('#review_complete').val(1);
jQuery.getJSON(this.docparams.docManURL +
'/?group_id=' + this.docparams.groupId +
'&action=getdocreviewcompleteform&docid='+this.docparams.id+'&revid='+this.review.review
, jQuery.proxy(function(data){
if (typeof data.html != 'undefined') {
@@ -565,6 +566,9 @@ DocManListFileController.prototype =
}
}, this.review));
} else {
+ jQuery('#tr-mandatory-reviewers').show();
+ jQuery('#tr-optional-reviewers').show();
+ jQuery('[class^=gentle]').remove();
jQuery('#review-select-mandatory-users').val(this.review.mandatoryusers);
jQuery('#review-select-optional-users').val(this.review.optionalusers);
jQuery('#review-select-mandatory-users').gentleSelect({columns: 3, itemWidth:
150});
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/DocumentReview.class.php | 14 ++++++++++++--
src/common/docman/actions/editfile.php | 4 ++++
src/www/docman/scripts/DocManController.js | 6 +++++-
3 files changed, 21 insertions(+), 3 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
