[Fusionforge-commits] FusionForge branch master updated. v6.0.5-2114-g4eb1da2

Franck Villaume nerville at libremir.placard.fr.eu.org
Mon Aug 14 19:20:39 CEST 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, master has been updated
       via  4eb1da216f2120ea3804a01d8a17a43f1b6afaed (commit)
      from  3ca1e91b51c7a360207f06e57a01555917c916d5 (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=4eb1da216f2120ea3804a01d8a17a43f1b6afaed

commit 4eb1da216f2120ea3804a01d8a17a43f1b6afaed
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Mon Aug 14 19:20:23 2017 +0200

    add missing info in Widget Project Public Areas: frs & docman

diff --git a/src/common/docman/DocumentManager.class.php b/src/common/docman/DocumentManager.class.php
index 520f5dc..d4680b4 100644
--- a/src/common/docman/DocumentManager.class.php
+++ b/src/common/docman/DocumentManager.class.php
@@ -457,4 +457,14 @@ class DocumentManager extends FFError {
 		}
 		return $results;
 	}
+
+	function getNbDocs() {
+		$res = db_query_params('SELECT count(docid) as docs FROM doc_data WHERE group_id = $1', array($this->Group->getID()));
+		return db_result($res, 0, 0);
+	}
+
+	function getNbFolders() {
+		$res = db_query_params('SELECT count(doc_group) as folders FROM doc_groups WHERE group_id = $1', array($this->Group->getID()));
+		return db_result($res, 0, 0);
+	}
 }
diff --git a/src/common/frs/FRSManager.class.php b/src/common/frs/FRSManager.class.php
index 1bd32ee..c893c5e 100644
--- a/src/common/frs/FRSManager.class.php
+++ b/src/common/frs/FRSManager.class.php
@@ -20,6 +20,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+require_once $gfcommon.'frs/FRSPackageFactory.class.php';
+require_once $gfcommon.'frs/FRSReleaseFactory.class.php';
+
 class FRSManager extends FFError {
 	/**
 	 * The Group object.
@@ -55,4 +58,14 @@ class FRSManager extends FFError {
 		$settings['group_id']        = $this->Group->getID();
 		return $settings;
 	}
+
+	function getNbReleases() {
+		$frsrf = new FRSReleaseFactory($this->Group);
+		return count($frsrf->getFRSRs());
+	}
+
+	function getNbPackages() {
+		$frspf = new FRSPackageFactory($this->Group);
+		return count($frspf->getAllPackagesIds());
+	}
 }
diff --git a/src/common/widget/Widget_ProjectPublicAreas.class.php b/src/common/widget/Widget_ProjectPublicAreas.class.php
index 5d29cd2..dd1dc10 100644
--- a/src/common/widget/Widget_ProjectPublicAreas.class.php
+++ b/src/common/widget/Widget_ProjectPublicAreas.class.php
@@ -21,6 +21,8 @@
  */
 
 require_once 'Widget.class.php';
+require_once $gfcommon.'frs/FRSManager.class.php';
+require_once $gfcommon.'docman/DocumentManager.class.php';
 
 /**
  * Widget_ProjectPublicAreas
@@ -122,6 +124,8 @@ class Widget_ProjectPublicAreas extends Widget {
 			$link_content = $HTML->getDocmanPic('') . ' ' . _('Document Manager');
 			//	<a rel="sioc:container_of" xmlns:sioc="http://rdfs.org/sioc/ns#" href="'.util_make_url ('/docman/?group_id='.$group_id).'">';
 			$result .= util_make_link('/docman/?group_id='.$group_id, $link_content);
+			$docm = new DocumentManager($project);
+			$result .= ' ('.html_e('strong', array(), $docm->getNbDocs(), true, false).' '._('documents').' '._('in').' '.html_e('strong', array(), $docm->getNbFolders(), true, false).' '._('directories').')';
 			$result .= '</div>';
 		}
 
@@ -132,6 +136,8 @@ class Widget_ProjectPublicAreas extends Widget {
 			$link_content = $HTML->getPackagePic('') . ' ' . _('Files');
 			//	<a rel="sioc:container_of" xmlns:sioc="http://rdfs.org/sioc/ns#" href="'.util_make_url ('/frs/?group_id='.$group_id).'">';
 			$result .= util_make_link('/frs/?group_id='.$group_id, $link_content);
+			$frsm = new FRSManager($project);
+			$result .= ' ('.html_e('strong', array(), $frsm->getNbReleases(), true, false).' '._('releases').' '._('in').' '.html_e('strong', array(), $frsm->getNbPackages(), true, false).' '._('packages').')';
 			$result .= '</div>';
 		}
 

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

Summary of changes:
 src/common/docman/DocumentManager.class.php           | 10 ++++++++++
 src/common/frs/FRSManager.class.php                   | 13 +++++++++++++
 src/common/widget/Widget_ProjectPublicAreas.class.php |  6 ++++++
 3 files changed, 29 insertions(+)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list