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, Branch_5_3 has been updated
via 7353d7c1a1262d2ee669277dbb6c53a021c9a0b6 (commit)
from b50acbd61113ab314ac03029f579552321c6024b (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 -----------------------------------------------------------------
commit 7353d7c1a1262d2ee669277dbb6c53a021c9a0b6
Author: Franck Villaume <[email protected]>
Date: Fri May 30 20:42:01 2014 +0200
fix [#682]: fix search engine documents, use the right section to check
about permissions
diff --git a/src/CHANGES b/src/CHANGES
index b14284e..1215a0f 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -33,7 +33,8 @@ Fusionforge-5.3.1:
* Plugin message: handle empty site message (Inria)
* Plugin mediawiki: fix icon in project page link (Inria)
* Plugin hudson: fix roles access in widgets [#683] (TrivialDev)
-* Admin User: fix unix_status [#666](TrivialDev)
+* Admin User: fix unix_status [#666] (TrivialDev)
+* Search: fix roles based access to documents using the search engine [#682]
(TrivialDev)
FusionForge-5.3:
* Widget: MyArtifacts Enhancement : add monitored artifacts (TrivialDev)
diff --git
a/src/www/search/include/renderers/DocsAllHtmlSearchRenderer.class.php
b/src/www/search/include/renderers/DocsAllHtmlSearchRenderer.class.php
index 54dc741..560a296 100644
--- a/src/www/search/include/renderers/DocsAllHtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/DocsAllHtmlSearchRenderer.class.php
@@ -4,7 +4,7 @@
*
* Copyright 2004 (c) Dominik Haas, GForge Team
* Copyright 2011, Franck Villaume - Capgemini
- * Copyright 2013, Franck Villaume - TrivialDev
+ * Copyright 2013,2014 Franck Villaume - TrivialDev
* Copyright 2013, French Ministry of National Education
* http://fusionforge.org
*
@@ -87,11 +87,11 @@ class DocsAllHtmlSearchRenderer extends HtmlSearchRenderer {
$rowColor = 0;
for($i = 0; $i < $rowsCount; $i++) {
//section changed
- $currentDocGroup = db_result($result, $i,
'project_name');
- $currentDocGroupObject =
group_get_object_by_publicname($currentDocGroup);
- if(!forge_check_perm('project_read',
$currentDocGroupObject->getID())) {
+ if(!forge_check_perm('docman', db_result($result, $i,
'project_name'), 'read')) {
continue;
}
+ $currentDocGroup = db_result($result, $i,
'project_name');
+ $currentDocGroupObject =
group_get_object_by_publicname($currentDocGroup);
if ($lastDocGroup != $currentDocGroup) {
$return .=
'<tr><td>'.html_image('ic/home16b.png', '10', '12', array('border' =>
'0')).'<b>'.util_make_link('/docman/?group_id='.$currentDocGroupObject->getID(),$currentDocGroup).'</b></td><td
colspan="3"> </td></tr>';
$lastDocGroup = $currentDocGroup;
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 3 ++-
.../include/renderers/DocsAllHtmlSearchRenderer.class.php | 8 ++++----
2 files changed, 6 insertions(+), 5 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
