[Fusionforge-commits] r8310 - branches/Branch_4_8/gforge/common/docman
Olivier Meunier
musicoliv at libremir.placard.fr.eu.org
Mon Oct 19 17:08:01 CEST 2009
Author: musicoliv
Date: 2009-10-19 17:08:01 +0200 (Mon, 19 Oct 2009)
New Revision: 8310
Modified:
branches/Branch_4_8/gforge/common/docman/DocumentGroup.class.php
Log:
Fix recursive display of docs in admin view and standard view without javascript
Modified: branches/Branch_4_8/gforge/common/docman/DocumentGroup.class.php
===================================================================
--- branches/Branch_4_8/gforge/common/docman/DocumentGroup.class.php 2009-10-19 12:37:43 UTC (rev 8309)
+++ branches/Branch_4_8/gforge/common/docman/DocumentGroup.class.php 2009-10-19 15:08:01 UTC (rev 8310)
@@ -266,10 +266,10 @@
}
// this group doesn't have documents... check recursively on the childs
- if (is_array($nested_groups["$doc_group_id"])) {
- $count = count($nested_groups["$doc_group_id"]);
+ if (array_key_exists($doc_group_id,$nested_groups) && is_array($nested_groups[$doc_group_id])) {
+ $count = count($nested_groups[$doc_group_id]);
for ($i=0; $i < $count; $i++) {
- if ($nested_groups["$doc_group_id"][$i]->hasDocuments($nested_groups, $document_factory, $stateid)) {
+ if ($nested_groups[$doc_group_id][$i]->hasDocuments($nested_groups, $document_factory, $stateid)) {
// child has documents
$result[$stateid][$doc_group_id] = true;
return true;
@@ -293,15 +293,15 @@
function hasSubgroup(&$nested_groups, $doc_subgroup_id) {
$doc_group_id = $this->getID();
- if (is_array(@$nested_groups["$doc_group_id"])) {
- $count = count($nested_groups["$doc_group_id"]);
+ if (is_array(@$nested_groups[$doc_group_id])) {
+ $count = count($nested_groups[$doc_group_id]);
for ($i=0; $i < $count; $i++) {
// child is a match?
- if ($nested_groups["$doc_group_id"][$i]->getID() == $doc_subgroup_id) {
+ if ($nested_groups[$doc_group_id][$i]->getID() == $doc_subgroup_id) {
return true;
} else {
// recursively check if this child has this subgroup
- if ($nested_groups["$doc_group_id"][$i]->hasSubgroup($nested_groups, $doc_subgroup_id)) {
+ if ($nested_groups[$doc_group_id][$i]->hasSubgroup($nested_groups, $doc_subgroup_id)) {
return true;
}
}
More information about the Fusionforge-commits
mailing list