[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1243-g0571925

Franck Villaume nerville at libremir.placard.fr.eu.org
Sat Dec 17 16:08:11 CET 2016


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  0571925e38220d2f46f7cd9e4b7f7a1a84c3f0e3 (commit)
      from  d382684f42267a48ddf649d39bdbe5123e2f4eb5 (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=0571925e38220d2f46f7cd9e4b7f7a1a84c3f0e3

commit 0571925e38220d2f46f7cd9e4b7f7a1a84c3f0e3
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Dec 17 16:07:51 2016 +0100

    fix edit review when document is pending

diff --git a/src/common/docman/DocumentReview.class.php b/src/common/docman/DocumentReview.class.php
index 0526228..8ef4969 100644
--- a/src/common/docman/DocumentReview.class.php
+++ b/src/common/docman/DocumentReview.class.php
@@ -208,7 +208,9 @@ class DocumentReview extends FFError {
 																		endreviewdate: \''.util_html_encode($enddate).'\',
 																		serialid: '.$this->getSerialID().',
 																		mandatoryusers: '.json_encode($mandatoryUsers).',
-																		optionalusers: '.json_encode($optionalUsers).',})'), true);
+																		optionalusers: '.json_encode($optionalUsers).',
+																		docid: '.$this->Document->getID().',
+																		groupId: '.$this->Document->Group->getID().'})'), true);
 		} else {
 			return util_make_link('#', $HTML->getClosedTicketPic(_('Complete this review'), 'completereview'),
 					array('id' => 'review_action_complete', 'onclick' => 'javascript:controllerListFile.toggleEditReviewView({review: '.$this->getID().', title: \''.addslashes($this->getTitle()).'\',
@@ -217,8 +219,9 @@ class DocumentReview extends FFError {
 																		serialid: '.$this->getSerialID().',
 																		mandatoryusers: '.json_encode($mandatoryUsers).',
 																		optionalusers: '.json_encode($optionalUsers).',
+																		docid: '.$this->Document->getID().',
+																		groupId: '.$this->Document->Group->getID().',
 																		complete: 1})'), true);
-
 		}
 	}
 
diff --git a/src/www/docman/scripts/DocManController.js b/src/www/docman/scripts/DocManController.js
index 5dc004d..6a67ac1 100644
--- a/src/www/docman/scripts/DocManController.js
+++ b/src/www/docman/scripts/DocManController.js
@@ -560,7 +560,7 @@ DocManListFileController.prototype =
 				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){
+				jQuery.getJSON(this.listfileparams.docManURL + '/?group_id=' + this.review.groupId + '&action=getdocreviewcompleteform&docid='+this.review.docid+'&revid='+this.review.review , jQuery.proxy(function(data){
 					if (typeof data.html != 'undefined') {
 						jQuery('#editfile-completedreview').prepend(data.html);
 					}
@@ -574,7 +574,7 @@ DocManListFileController.prototype =
 				jQuery('#review-select-mandatory-users').gentleSelect({columns: 3, itemWidth: 150});
 				jQuery('#review-select-optional-users').gentleSelect({columns: 3, itemWidth: 150});
 			}
-			jQuery.getJSON(this.docparams.docManURL + '/?group_id=' + this.docparams.groupId + '&action=getdocreviewuserstatus&docid='+this.docparams.id+'&revid='+this.review.review , jQuery.proxy(function(data){
+			jQuery.getJSON(this.listfileparams.docManURL + '/?group_id=' + this.review.groupId + '&action=getdocreviewuserstatus&docid='+this.review.docid+'&revid='+this.review.review , jQuery.proxy(function(data){
 				if (typeof data.html != 'undefined') {
 					jQuery('#editfile-userstatusreview').prepend(data.html);
 				}

-----------------------------------------------------------------------

Summary of changes:
 src/common/docman/DocumentReview.class.php | 7 +++++--
 src/www/docman/scripts/DocManController.js | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list