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 2f2067ed2d106628efd7c5ce47399e47239c50af (commit)
from 996676b13aa0c5d0f7ad456737d6ee5b6e444bd6 (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=2f2067ed2d106628efd7c5ce47399e47239c50af
commit 2f2067ed2d106628efd7c5ce47399e47239c50af
Author: Sylvain Beucler <[email protected]>
Date: Mon Jun 22 16:43:05 2015 +0200
project: fix frs admin URL
diff --git a/src/CHANGES b/src/CHANGES
index bfde363..6a7fee6 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -7,6 +7,7 @@ FusionForge 6.0.1:
* Forum: fix conflict between attachments and pending attachments [#662]
(Inria)
* FRS: display new releases first (Roland Mas, for Inria)
* FRS: revert Notes and ChangeLog as optional fields (Inria)
+* FRS: fix administration link in project Tools page (Inria)
* Tracker: fix description re-html-ization when editing item (Inria)
* Tracker: fix HTML entities in mail notifications (Inria)
* Tracker: provide a "Submit" button below the "add a comment" field [#776]
(TrivialDev)
diff --git a/src/www/project/admin/tools.php b/src/www/project/admin/tools.php
index f1ac15b..b58d5ae 100644
--- a/src/www/project/admin/tools.php
+++ b/src/www/project/admin/tools.php
@@ -363,7 +363,7 @@ if($group->usesSCM()) {
echo html_e('p', array(),
util_make_link('/scm/admin/?group_id='.$group->getID(), _('Source Code
Admin')), false);
}
if($group->usesFRS()) {
- echo html_e('p', array(),
util_make_link('/frs/admin/?group_id='.$group->getID(), _('File Release System
Admin')), false);
+ echo html_e('p', array(),
util_make_link('/frs/?group_id='.$group->getID().'&view=admin', _('File Release
System Admin')), false);
}
$hook_params = array();
diff --git a/src/www/projects b/src/www/projects
index deafa41..e10ec17 100644
--- a/src/www/projects
+++ b/src/www/projects
@@ -128,7 +128,7 @@ if (!isset($group_id) && !isset($project)) {
} else if ($subpage == "files" || $subpage == "download" ||
$subpage == "dl") {
if ($subpage2 == "release") {
-
session_redirect("/frs/admin/qrs.php?group_id=$group_id");
+
session_redirect("/frs/?group_id=$group_id&view=qrs");
} else {
session_redirect("/frs/?group_id=$group_id");
}
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 1 +
src/www/project/admin/tools.php | 2 +-
src/www/projects | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
