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 11dbb66b84578ac2650d72ab6a769c78a88a640e (commit)
via f4de37c176b6a76a5db62b1fea75a1a93aeabb76 (commit)
from 324eaaefca9997452978d8b2e337cdedfb61b987 (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=11dbb66b84578ac2650d72ab6a769c78a88a640e
commit 11dbb66b84578ac2650d72ab6a769c78a88a640e
Merge: 324eaae f4de37c
Author: Franck Villaume <[email protected]>
Date: Sat Nov 28 17:39:50 2015 +0100
Merge 6.0
diff --cc src/www/admin/grouplist.php
index 1cf3f1b,7f88d41..edf2f51
--- a/src/www/admin/grouplist.php
+++ b/src/www/admin/grouplist.php
@@@ -23,35 -23,15 +23,37 @@@
require_once '../env.inc.php';
require_once $gfcommon.'include/pre.php';
+require_once $gfcommon.'include/UserManager.class.php';
require_once $gfwww.'admin/admin_utils.php';
+global $LUSER;
+
site_admin_header(array('title'=>_('Project List')));
+if (getStringFromRequest('setpaging')) {
+ /* store paging preferences */
+ $paging = getIntFromRequest('nres');
+ if (!$paging) {
+ $paging = 25;
+ }
+ $LUSER->setPreference('paging', $paging);
+} else {
+ $paging = $LUSER->getPreference('paging');
+}
+
+if (!$paging)
+ $paging = 25;
+
+$start = getIntFromRequest('start');
+if ($start < 0) {
+ $start = 0;
+}
+
- $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',
@@@ -64,20 -44,25 +66,26 @@@
'is_template')) ;
if ($sortorder == 'is_public') {
- $sortorder = 'group_name';
+ $sqlsortorder = 'group_name';
} elseif ($sortorder == 'is_template' || $sortorder == 'members') {
- $sortorder .= ' DESC';
+ $sqlsortorder = $sortorder.' DESC';
+} else {
+ $sqlsortorder = $sortorder;
}
- $filter = '';
- if ($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.' OFFSET $2 LIMIT $3',
- array(strtolower("$group_name_search%"),
$start, $paging));
- $totalProjects =
FusionForge::getInstance()->getNumberOfProjectsFilteredByGroupName($group_name_search);
-
+ $sqlsortorder = $sortorder;
+ if ($usingplugin) {
+ $filter='&usingplugin='.$usingplugin;
- echo "<p>"._('Projects that use plugin'). "
<strong>".$usingplugin."</strong></p>\n";
++ echo html_e('p', array(), _('Projects that use plugin').'
'.html_e('strong', array(), $usingplugin));
+ $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";
++ 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%")));
} 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/CHANGES | 1 +
src/www/admin/grouplist.php | 24 ++++++++++++++++--------
2 files changed, 17 insertions(+), 8 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
