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 f4de37c176b6a76a5db62b1fea75a1a93aeabb76 (commit)
from ad64a4e2b3f0e31a805c26f1991fd888427c2052 (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=f4de37c176b6a76a5db62b1fea75a1a93aeabb76
commit f4de37c176b6a76a5db62b1fea75a1a93aeabb76
Author: Franck Villaume <[email protected]>
Date: Sat Nov 28 17:34:28 2015 +0100
fix [#800]: implement usingplugin in grouplist.php page
diff --git a/src/CHANGES b/src/CHANGES
index 7be551f..2910503 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -17,6 +17,7 @@ FusionForge 6.0.4:
* Plugin Projects Hierarchy: prevent auto-validation of parent-child requests
[#796] (Inria)
* Plugin Taskboard: fix blank admin page when project tracker is disabled
(Inria)
* Updated simplified Chinese translation (Mingye Wang)
+* Site Admin: fix grouplist.php listing projects using specific plugin [#800]
(TrivialDev)
FusionForge 6.0.3:
* Layout: fix rss url when url is absolute (TrivialDev)
diff --git a/src/www/admin/grouplist.php b/src/www/admin/grouplist.php
index b7d3c6f..7f88d41 100644
--- a/src/www/admin/grouplist.php
+++ b/src/www/admin/grouplist.php
@@ -3,7 +3,7 @@
* List of all groups in the system.
*
* Copyright 1999-2000 (c) The SourceForge Crew
- * Copyright 2013, Franck Villaume - TrivialDev
+ * Copyright 2013,2015 Franck Villaume - TrivialDev
*
* This file is part of FusionForge. FusionForge is free software;
* you can redistribute it and/or modify it under the terms of the
@@ -27,9 +27,11 @@ require_once $gfwww.'admin/admin_utils.php';
site_admin_header(array('title'=>_('Project List')));
-$sortorder = getStringFromRequest('sortorder');
+$sortorder = getStringFromRequest('sortorder', 'group_name');
$group_name_search = getStringFromRequest('group_name_search');
$status = getStringFromRequest('status');
+$usingplugin = getStringFromRequest('usingplugin');
+$filter = '';
$sortorder = util_ensure_value_in_set($sortorder,
array ('group_name',
@@ -49,8 +51,15 @@ if ($sortorder == 'is_public') {
$sqlsortorder = $sortorder;
-
-if ($group_name_search != '') {
+if ($usingplugin) {
+ $filter='&usingplugin='.$usingplugin;
+ echo "<p>"._('Projects that use plugin'). "
<strong>".$usingplugin."</strong></p>\n";
+ $qpa = db_construct_qpa(false, 'SELECT
group_name,register_time,unix_group_name,groups.group_id,groups.is_template,status,license_name,COUNT(DISTINCT(pfo_user_role.user_id))
AS members FROM groups LEFT OUTER JOIN pfo_role ON
pfo_role.home_group_id=groups.group_id LEFT OUTER JOIN pfo_user_role ON
pfo_user_role.role_id=pfo_role.role_id, licenses WHERE license_id=license and
groups.group_id in (SELECT group_plugin.group_id from group_plugin where
group_plugin.plugin_id = (SELECT plugins.plugin_id FROM plugins where
plugins.plugin_name = $1)) GROUP BY
group_name,register_time,unix_group_name,groups.group_id,groups.is_template,status,license_name',
+ array(strtolower($usingplugin)));
+ $qpa = db_construct_qpa($qpa, ' ORDER BY '.$sqlsortorder);
+ $res = db_query_qpa($qpa);
+} else if ($group_name_search != '') {
+ $filter='&group_name_search='.$group_name_search;
echo "<p>"._('Projects that begin with'). "
<strong>".$group_name_search."</strong></p>\n";
$res = db_query_params('SELECT
group_name,register_time,unix_group_name,groups.group_id,groups.is_template,status,license_name,COUNT(DISTINCT(pfo_user_role.user_id))
AS members FROM groups LEFT OUTER JOIN pfo_role ON
pfo_role.home_group_id=groups.group_id LEFT OUTER JOIN pfo_user_role ON
pfo_user_role.role_id=pfo_role.role_id, licenses WHERE license_id=license AND
lower(group_name) LIKE $1 GROUP BY
group_name,register_time,unix_group_name,groups.group_id,groups.is_template,status,license_name
ORDER BY '.$sqlsortorder,
array(strtolower ("$group_name_search%")));
@@ -75,14 +84,14 @@ $headers = array(
);
$headerLinks = array(
- '/admin/grouplist.php?sortorder=group_name',
- '/admin/grouplist.php?sortorder=register_time',
- '/admin/grouplist.php?sortorder=unix_group_name',
- '/admin/grouplist.php?sortorder=status',
- '/admin/grouplist.php?sortorder=is_public',
- '/admin/grouplist.php?sortorder=license_name',
- '/admin/grouplist.php?sortorder=members',
- '/admin/grouplist.php?sortorder=is_template'
+ '/admin/grouplist.php?sortorder=group_name'.$filter,
+ '/admin/grouplist.php?sortorder=register_time'.$filter,
+ '/admin/grouplist.php?sortorder=unix_group_name'.$filter,
+ '/admin/grouplist.php?sortorder=status'.$filter,
+ '/admin/grouplist.php?sortorder=is_public'.$filter,
+ '/admin/grouplist.php?sortorder=license_name'.$filter,
+ '/admin/grouplist.php?sortorder=members'.$filter,
+ '/admin/grouplist.php?sortorder=is_template'.$filter
);
$headerClass = array(
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 1 +
src/www/admin/grouplist.php | 33 +++++++++++++++++++++------------
2 files changed, 22 insertions(+), 12 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
