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 1fad02576b35e104aafa60935685bfab450d0f27 (commit)
from fc6ed13aa2a54f2c7056773b96c10789f8cd688a (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=1fad02576b35e104aafa60935685bfab450d0f27
commit 1fad02576b35e104aafa60935685bfab450d0f27
Author: Franck Villaume <[email protected]>
Date: Sun Sep 11 20:00:59 2016 +0200
fix PHP warning & paging on specific group search
diff --git a/src/www/admin/grouplist.php b/src/www/admin/grouplist.php
index 6ef4d29..b27679a 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,2015 Franck Villaume - TrivialDev
+ * Copyright 2013,2015-2016, 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
@@ -81,11 +81,13 @@ if ($usingplugin) {
array(strtolower($usingplugin)));
$qpa = db_construct_qpa($qpa, ' ORDER BY '.$sqlsortorder);
$res = db_query_qpa($qpa);
+ $totalProjects = db_numrows($res);
} elseif ($group_name_search != '') {
$filter='&group_name_search='.$group_name_search;
echo html_e('p', array(), _('Projects that begin with').'
'.html_e('strong', array(), $group_name_search));
$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%")));
+ $totalProjects = db_numrows($res);
} else {
$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') ;
if ($status) {
-----------------------------------------------------------------------
Summary of changes:
src/www/admin/grouplist.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
