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 d2d1e3ff0079c225644c09300334fd3d50480274 (commit)
from 356dd5ee9e6a854b69a136c06ffaf976402fdb7c (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=d2d1e3ff0079c225644c09300334fd3d50480274
commit d2d1e3ff0079c225644c09300334fd3d50480274
Author: Franck Villaume <[email protected]>
Date: Fri Jul 1 17:04:26 2016 +0200
Group: getRoles, same behavior than getRolesId
diff --git a/src/common/include/Group.class.php
b/src/common/include/Group.class.php
index 70aeefd..90c6cf9 100644
--- a/src/common/include/Group.class.php
+++ b/src/common/include/Group.class.php
@@ -2960,15 +2960,16 @@ if there is anything we can do to help you.
/**
* getRoles - Get the roles of the group.
*
+ * @param bool all roles or local roles only. Default is all
roles
* @return array Roles of this group.
*/
- function getRoles() {
+ function getRoles($global = true) {
$result = array();
- $roles = $this->getRolesId();
+ $roles = $this->getRolesId($global);
$engine = RBACEngine::getInstance();
foreach ($roles as $role_id) {
- $result[] = $engine->getRoleById ($role_id);
+ $result[] = $engine->getRoleById($role_id);
}
return $result;
-----------------------------------------------------------------------
Summary of changes:
src/common/include/Group.class.php | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
