[Fusionforge-commits] FusionForge branch 6.0 updated. v6.0.1-24-g41a4e05

Sylvain Beucler beuc-inria at libremir.placard.fr.eu.org
Fri Jun 26 11:32:17 CEST 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, 6.0 has been updated
       via  41a4e05464966878efa5e41b1d132d827d38e642 (commit)
      from  e11caeb4594e41d4dfc1c3487559e86f098e1cc4 (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=41a4e05464966878efa5e41b1d132d827d38e642

commit 41a4e05464966878efa5e41b1d132d827d38e642
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Fri Jun 26 11:31:20 2015 +0200

    FRS: don't reset permissions when derefencing roles in other projects [#782]

diff --git a/src/CHANGES b/src/CHANGES
index 2119446..ca459a3 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -3,6 +3,7 @@ FusionForge 6.0.2:
 * Mailing lists: fix description encoding depending on Mailman version (Inria & Thorsten Glaser)
 * Mailing lists: fix default list URL path (Inria)
 * Mailing lists: fix installation on CentOS (Inria)
+* FRS: don't reset permissions when derefencing roles in other projects [#782] (Inria)
 
 FusionForge 6.0.1:
 * Accounts: accept elliptic curve ssh keys (Unit 193)
diff --git a/src/common/include/RBAC.php b/src/common/include/RBAC.php
index 384fec5..f3110f7 100644
--- a/src/common/include/RBAC.php
+++ b/src/common/include/RBAC.php
@@ -924,7 +924,7 @@ abstract class BaseRole extends Error {
 		db_begin () ;
 
 		// Remove obsolete project-wide settings
-		$sections = array ('project_read', 'project_admin', 'frs', 'scm', 'docman', 'tracker_admin', 'new_tracker', 'forum_admin', 'new_forum', 'pm_admin', 'new_pm') ;
+		$sections = array ('project_read', 'project_admin', 'new_frs', 'scm', 'docman', 'tracker_admin', 'new_tracker', 'forum_admin', 'new_forum', 'pm_admin', 'new_pm') ;
 		db_query_params ('DELETE FROM pfo_role_setting where role_id=$1 AND section_name=ANY($2) and ref_id NOT IN (SELECT home_group_id FROM pfo_role WHERE role_id=$1 AND home_group_id IS NOT NULL UNION SELECT group_id from role_project_refs WHERE role_id=$1)',
 				 array ($this->getID(),
 					db_string_array_to_any_clause($sections))) ;
@@ -939,6 +939,8 @@ abstract class BaseRole extends Error {
 		db_query_params ('DELETE FROM pfo_role_setting where role_id=$1 AND section_name=$2 and ref_id NOT IN (SELECT group_forum_id FROM forum_group_list WHERE group_id IN (SELECT home_group_id FROM pfo_role WHERE role_id=$1 AND home_group_id IS NOT NULL UNION SELECT group_id from role_project_refs WHERE role_id=$1))',
 				 array ($this->getID(),
 					'forum')) ;
+		db_query_params ('DELETE FROM pfo_role_setting where role_id=$1 AND section_name=$2 and ref_id NOT IN (SELECT package_id FROM frs_package WHERE group_id IN (SELECT home_group_id FROM pfo_role WHERE role_id=$1 AND home_group_id IS NOT NULL UNION SELECT group_id from role_project_refs WHERE role_id=$1))',
+				 array ($this->getID(),	'frs')) ;
 
 		db_commit () ;
 		$this->fetchData($this->getID());

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

Summary of changes:
 src/CHANGES                 | 1 +
 src/common/include/RBAC.php | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list