[Fusionforge-commits] FusionForge branch master updated. v6.0.3-237-g5aa5d48

Franck Villaume nerville at libremir.placard.fr.eu.org
Sun Nov 22 13:28:25 CET 2015


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  5aa5d488be13c5f83d18a07446966b4bbf10aad5 (commit)
       via  451309bea8d51a65f52b902f50e4fb45f63fc435 (commit)
      from  8c7d4c58d88331b52978193861c8ec69f297373a (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=5aa5d488be13c5f83d18a07446966b4bbf10aad5

commit 5aa5d488be13c5f83d18a07446966b4bbf10aad5
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Nov 22 13:07:05 2015 +0100

    docman: fix tree with project-hierarchy

diff --git a/src/common/docman/views/tree.php b/src/common/docman/views/tree.php
index f5d9c1d..58d3e7b 100644
--- a/src/common/docman/views/tree.php
+++ b/src/common/docman/views/tree.php
@@ -6,7 +6,7 @@
  * Copyright 2002-2003, Tim Perdue/GForge, LLC
  * Copyright 2010-2011, Franck Villaume - Capgemini
  * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
- * Copyright 2013-2014, Franck Villaume - TrivialDev
+ * Copyright 2013-2015, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -32,6 +32,8 @@ global $linkmenu;
 global $g; // the group object
 global $dirid; // the selected directory
 global $dm; // the document manager
+global $warning_msg;
+global $childgroup_id;
 
 if (!forge_check_perm('docman', $group_id, 'read')) {
 	$warning_msg= _('Document Manager Access Denied');
@@ -69,7 +71,7 @@ if (isset($projectIDsArray) && is_array($projectIDsArray)) {
 			echo html_ao('script', array('type' => 'text/javascript'));
 			echo '//<![CDATA[
 				jQuery(document).ready(function() {
-					if (typeof(jQuery(\'#'.$g->getUnixname().'-tree\').simpleTreeMenu) != "undefined") {
+					if (typeof(jQuery(\'#'.$groupObject->getUnixname().'-tree\').simpleTreeMenu) != "undefined") {
 						jQuery(\'#'.$groupObject->getUnixname().'-tree\').simpleTreeMenu();
 					}
 				});
@@ -78,12 +80,12 @@ if (isset($projectIDsArray) && is_array($projectIDsArray)) {
 		}
 	}
 }
-if (isset($childgroup_id) && $childgroup_id) {
+if ($childgroup_id) {
 	$groupObject = group_get_object($childgroup_id);
 	echo html_ao('script', array('type' => 'text/javascript'));
 	echo '//<![CDATA[
 			jQuery(document).ready(function() {
-				if (typeof(jQuery(\'#'.$g->getUnixname().'-tree\').simpleTreeMenu) != "undefined") {
+				if (typeof(jQuery(\'#'.$groupObject->getUnixname().'-tree\').simpleTreeMenu) != "undefined") {
 					jQuery(\'#'.$groupObject->getUnixname().'-tree\').simpleTreeMenu(\'expandToNode\', jQuery(\'#leaf-'.$dirid.'\'));
 				}
 			});

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

commit 451309bea8d51a65f52b902f50e4fb45f63fc435
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Nov 22 13:03:21 2015 +0100

    docman: support project-hierarchy plugin in help view

diff --git a/src/common/docman/views/help.php b/src/common/docman/views/help.php
index 6af482e..621adef 100644
--- a/src/common/docman/views/help.php
+++ b/src/common/docman/views/help.php
@@ -27,12 +27,19 @@
 global $group_id; // id of the group
 global $g; // the project object
 global $warning_msg;
+global $childgroup_id;
 
 if (!forge_check_perm('docman', $group_id, 'read')) {
 	$warning_msg = _('Document Manager Access Denied');
 	session_redirect('/docman/?group_id='.$group_id);
 }
 
+// plugin hierarchy support
+if ($childgroup_id) {
+	$group_id = $childgroup_id;
+	$g = group_get_object($childgroup_id);
+}
+
 echo html_ao('div', array('class' => 'docmanDivIncluded'));
 plugin_hook('blocks', 'doc help');
 if (forge_get_config('use_webdav') && $g->useWebdav()) {

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

Summary of changes:
 src/common/docman/views/help.php |  7 +++++++
 src/common/docman/views/tree.php | 10 ++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list