[Fusionforge-commits] FusionForge branch 6.1 updated. v6.1beta1-34-g068534d

Franck Villaume nerville at libremir.placard.fr.eu.org
Sun Dec 31 17:11:46 CET 2017


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, 6.1 has been updated
       via  068534da19bbeb8edeb18cd1933ccb3e08cbb084 (commit)
      from  1b421b74881babd4e87063d748721ca65ac3cf01 (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=068534da19bbeb8edeb18cd1933ccb3e08cbb084

commit 068534da19bbeb8edeb18cd1933ccb3e08cbb084
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Dec 31 17:11:32 2017 +0100

    rss docman: fix getDocuments

diff --git a/src/www/export/rss20_docman.php b/src/www/export/rss20_docman.php
index 696fe86..067bfbf 100644
--- a/src/www/export/rss20_docman.php
+++ b/src/www/export/rss20_docman.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * FusionForge Documents RSS Feed
- * Copyright 2012,2015 Franck Villaume - TrivialDev
+ * Copyright 2012,2015,2017, Franck Villaume - TrivialDev
  * http://fusionforge.org/
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -59,7 +59,17 @@ if (isset($group_id) && !empty($group_id) && is_numeric($group_id)) {
 		endOnError($df->getErrorMessage());
 	}
 
-	$d_arr =& $df->getDocuments();
+	$stateIdDg = 1;
+	$stateIdDocuments = array(1);
+	if (forge_check_perm('docman', $group_id, 'approve')) {
+		$stateIdDg = 5;
+		$stateIdDocuments = array(1, 2, 3, 4, 5);
+	}
+	$df->setDocGroupState($stateIdDg);
+	$df->setStateID($stateIdDocuments);
+	$df->setOrder(array('updatedate', 'createdate'));
+	$df->setSort('DESC');
+	$d_arr = $df->getDocuments();
 
 	writeFeed($d_arr, $limit);
 	endFeed();

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

Summary of changes:
 src/www/export/rss20_docman.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list