[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1661-g3bcd916

[Franck Villaume]

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  3bcd916e30da7b21806ce1b10e71ff8027c36d12 (commit)
       via  f184b94318995512d2078cf55b16e61a13b7e4b1 (commit)
      from  b89083b52e8354b11f1d4da207e083702c78cf10 (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=3bcd916e30da7b21806ce1b10e71ff8027c36d12

commit 3bcd916e30da7b21806ce1b10e71ff8027c36d12
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Mon Apr 17 16:06:41 2017 +0200

    add missing information about review

diff --git a/src/common/docman/DocumentReviewFactory.class.php b/src/common/docman/DocumentReviewFactory.class.php
index 59fc008..ffa73bb 100644
--- a/src/common/docman/DocumentReviewFactory.class.php
+++ b/src/common/docman/DocumentReviewFactory.class.php
@@ -2,7 +2,7 @@
 /**
  * FusionForge Documentation Manager
  *
- * Copyright 2016,2017, Franck Villaume - TrivialDev
+ * Copyright 2016-2017, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -61,7 +61,13 @@ class DocumentReviewFactory extends FFError {
 					array(db_int_array_to_any_clause($serialids), $this->Document->getID()));
 		if ($res) {
 			while ($arr = db_fetch_array($res)) {
-				$serialid = $arr['serialid'];
+				$dr = new DocumentReview($this->Document, $arr['revid']);
+				$drcf = new DocumentReviewCommentFactory($dr);
+				$arr['comments'] = $drcf->getComments();
+				foreach ($arr['comments'] as $comment) {
+					unset($comment->DocumentReview);
+				}
+				$arr['users'] = $dr->getUsers();
 				$this->reviews[] = $arr;
 			}
 		}

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=f184b94318995512d2078cf55b16e61a13b7e4b1

commit f184b94318995512d2078cf55b16e61a13b7e4b1
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Mon Apr 17 16:06:14 2017 +0200

    add missing require

diff --git a/src/common/docman/DocumentReviewCommentFactory.class.php b/src/common/docman/DocumentReviewCommentFactory.class.php
index 8033294..6568bc5 100644
--- a/src/common/docman/DocumentReviewCommentFactory.class.php
+++ b/src/common/docman/DocumentReviewCommentFactory.class.php
@@ -2,7 +2,7 @@
 /**
  * FusionForge Documentation Manager
  *
- * Copyright 2016, Franck Villaume - TrivialDev
+ * Copyright 2016-2017, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -21,6 +21,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+require_once $gfcommon.'docman/DocumentReviewComment.class.php';
+
 class DocumentReviewCommentFactory extends FFError {
 	/**
 	 * The DocumentReview object.

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

Summary of changes:
 src/common/docman/DocumentReviewCommentFactory.class.php |  4 +++-
 src/common/docman/DocumentReviewFactory.class.php        | 10 ++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
FusionForge