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 ba150598e986aaf830b6a0883bd9a7eac1346789 (commit)
from 19f476edb6fc6e70b87696eee6a9bfa55788c560 (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=ba150598e986aaf830b6a0883bd9a7eac1346789
commit ba150598e986aaf830b6a0883bd9a7eac1346789
Author: Franck Villaume <[email protected]>
Date: Sun Jun 28 16:59:17 2015 +0200
fix FRS: do not display hidden releases publicly
diff --git a/src/CHANGES b/src/CHANGES
index a91c4cf..fc9a93d 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -4,6 +4,7 @@ FusionForge 6.0.2:
* 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)
+* FRS: do not display hidden releases publicly (TrivialDev)
* Tracker: fix column title in add/update custom field elements (TrivialDev)
* Plugin Taskboard: fix logic on initialize error (TrivialDev)
* Plugin Taskboard: fix background column color setting (TrivialDev)
diff --git a/src/common/frs/FRSPackage.class.php
b/src/common/frs/FRSPackage.class.php
index 2c51fe1..02c9159 100644
--- a/src/common/frs/FRSPackage.class.php
+++ b/src/common/frs/FRSPackage.class.php
@@ -474,13 +474,19 @@ class FRSPackage extends Error {
*
* @return array Array of FRSRelease Objects.
*/
- function &getReleases() {
+ function &getReleases($status = false) {
if (!is_array($this->package_releases) ||
count($this->package_releases) < 1) {
$this->package_releases=array();
$res = db_query_params('SELECT * FROM frs_release WHERE
package_id=$1 ORDER BY release_date DESC',
array($this->getID()));
while ($arr = db_fetch_array($res)) {
- $this->package_releases[] =
$this->newFRSRelease($arr['release_id'], $arr);
+ if ($status) {
+ if (forge_check_perm('frs',
$arr['release_id'], 'read')) {
+ $this->package_releases[] =
$this->newFRSRelease($arr['release_id'], $arr);
+ }
+ } else {
+ $this->package_releases[] =
$this->newFRSRelease($arr['release_id'], $arr);
+ }
}
}
return $this->package_releases;
diff --git a/src/common/frs/views/listpackages.php
b/src/common/frs/views/listpackages.php
index 1b4abd7..e9b5147 100644
--- a/src/common/frs/views/listpackages.php
+++ b/src/common/frs/views/listpackages.php
@@ -88,7 +88,7 @@ if (count($FRSPackages) < 1) {
}
// get the releases of the package
- $FRSPackageReleases = $FRSPackage->getReleases();
+ $FRSPackageReleases = $FRSPackage->getReleases(true);
$num_releases = count($FRSPackageReleases);
$proj_stats['releases'] += $num_releases;
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 1 +
src/common/frs/FRSPackage.class.php | 10 ++++++++--
src/common/frs/views/listpackages.php | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
