[Fusionforge-commits] FusionForge branch Branch_5_3 updated. 267b8768e76c9f1ddbf5f1b5238e428ccb3262af
Franck Villaume
nerville at fusionforge.org
Sat Mar 29 19:26:41 CET 2014
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 267b8768e76c9f1ddbf5f1b5238e428ccb3262af (commit)
from 0eacb1c45ef820253934fd5b7b7d385fd484172c (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 267b8768e76c9f1ddbf5f1b5238e428ccb3262af
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Sat Mar 29 19:26:06 2014 +0100
Tracker Vote: initial fix for permission.
diff --git a/src/common/include/RBAC.php b/src/common/include/RBAC.php
index f0dde0f..2a08fd5 100644
--- a/src/common/include/RBAC.php
+++ b/src/common/include/RBAC.php
@@ -69,11 +69,11 @@ abstract class BaseRole extends Error {
'pm_admin' => array(0, 1),
'forum_admin' => array(0, 1),
- 'tracker' => array(0, 1, 9, 11, 13, 15, 17, 19, 21, 23),
+ 'tracker' => array(0, 1, 9, 11, 13, 15, 23, 25, 27, 29),
'pm' => array(0, 1, 3, 5, 7),
'forum' => array(0, 1, 2, 3, 4),
- 'new_tracker' => array(0, 1, 9, 11, 13, 15, 17, 19, 21, 23),
+ 'new_tracker' => array(0, 1, 9, 11, 13, 15, 23, 25, 27, 29),
'new_pm' => array(0, 1, 3, 5, 7),
'new_forum' => array(0, 1, 2, 3, 4),
@@ -778,13 +778,13 @@ abstract class BaseRole extends Error {
if ($role_name != $this->getName()) {
$this->setName($role_name) ;
}
-
+
$res = db_prepare ('DELETE FROM pfo_role_setting WHERE role_id=$1 AND section_name=$2 AND ref_id=$3',
'delete_from_pfo_role_setting');
$res = db_prepare ('INSERT INTO pfo_role_setting (role_id, section_name, ref_id, perm_val) VALUES ($1, $2, $3, $4)',
'insert_into_pfo_role_setting');
-
+
foreach ($data as $sect => $refs) {
foreach ($refs as $refid => $value) {
$res = db_execute ('delete_from_pfo_role_setting',
diff --git a/src/common/include/rbac_texts.php b/src/common/include/rbac_texts.php
index 9fc0cde..e03d74e 100644
--- a/src/common/include/rbac_texts.php
+++ b/src/common/include/rbac_texts.php
@@ -81,14 +81,14 @@ function setup_rbac_strings () {
'tracker13' => _('Manager'),
'tracker14' => _('Tech & manager (no read access)'),
'tracker15' => _('Tech & manager'),
- 'tracker16' => _('No access + Vote'),
- 'tracker17' => _('Read only + Vote'),
- 'tracker18' => _('Technician (no read access) + Vote'),
- 'tracker19' => _('Technician + Vote'),
- 'tracker20' => _('Manager (no read access) + Vote'),
- 'tracker21' => _('Manager + Vote'),
- 'tracker22' => _('Tech & manager (no read access) + Vote'),
- 'tracker23' => _('Tech & manager + Vote'),
+ 'tracker22' => _('No access + Vote'),
+ 'tracker23' => _('Read only + Vote'),
+ 'tracker24' => _('Technician (no read access) + Vote'),
+ 'tracker25' => _('Technician + Vote'),
+ 'tracker26' => _('Manager (no read access) + Vote'),
+ 'tracker27' => _('Manager + Vote'),
+ 'tracker28' => _('Tech & manager (no read access) + Vote'),
+ 'tracker29' => _('Tech & manager + Vote'),
'pm0' => _('No Access'),
'pm1' => _('Read only'),
'pm2' => _('Technician (no read access)'),
@@ -119,14 +119,14 @@ function setup_rbac_strings () {
'new_tracker13' => _('Manager'),
'new_tracker14' => _('Tech & manager (no read access)'),
'new_tracker15' => _('Tech & manager'),
- 'new_tracker16' => _('No access + Vote'),
- 'new_tracker17' => _('Read only + Vote'),
- 'new_tracker18' => _('Technician (no read access) + Vote'),
- 'new_tracker19' => _('Technician + Vote'),
- 'new_tracker20' => _('Manager (no read access) + Vote'),
- 'new_tracker21' => _('Manager + Vote'),
- 'new_tracker22' => _('Tech & manager (no read access) + Vote'),
- 'new_tracker23' => _('Tech & manager + Vote'),
+ 'new_tracker22' => _('No access + Vote'),
+ 'new_tracker23' => _('Read only + Vote'),
+ 'new_tracker24' => _('Technician (no read access) + Vote'),
+ 'new_tracker25' => _('Technician + Vote'),
+ 'new_tracker26' => _('Manager (no read access) + Vote'),
+ 'new_tracker27' => _('Manager + Vote'),
+ 'new_tracker28' => _('Tech & manager (no read access) + Vote'),
+ 'new_tracker29' => _('Tech & manager + Vote'),
'new_pm0' => _('No Access'),
'new_pm1' => _('Read only'),
'new_pm2' => _('Technician (no read access)'),
-----------------------------------------------------------------------
Summary of changes:
src/common/include/RBAC.php | 8 ++++----
src/common/include/rbac_texts.php | 32 ++++++++++++++++----------------
2 files changed, 20 insertions(+), 20 deletions(-)
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list