[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[22839] branches/4.x

[<sy...@us...>]

Revision: 22839
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=22839&view=rev
Author:   sylvieg
Date:     2009-11-03 17:43:12 +0000 (Tue, 03 Nov 2009)

Log Message:
-----------
[FIX]admin group: pagination

Modified Paths:
--------------
    branches/4.x/lib/userslib.php
    branches/4.x/templates/tiki-admingroups.tpl
    branches/4.x/tiki-admingroups.php

Modified: branches/4.x/lib/userslib.php
===================================================================
--- branches/4.x/lib/userslib.php	2009-11-03 17:34:00 UTC (rev 22838)
+++ branches/4.x/lib/userslib.php	2009-11-03 17:43:12 UTC (rev 22839)
@@ -1610,9 +1610,10 @@
 		return $ret;
 	}
 
-    function get_group_users($group) {
+    function get_group_users($group, $offset) {
+		global $prefs;
 	$query = "select `login`  from `users_users` uu, `users_usergroups` ug where uu.`userId`=ug.`userId` and `groupName`=?";
-	$result = $this->query($query,array($group));
+	$result = $this->query($query,array($group), $prefs['maxRecords'], $offset);
 	$ret = array();
 	while ($res = $result->fetchRow()) {
 	    $ret[] = $res["login"];

Modified: branches/4.x/templates/tiki-admingroups.tpl
===================================================================
--- branches/4.x/templates/tiki-admingroups.tpl	2009-11-03 17:34:00 UTC (rev 22838)
+++ branches/4.x/templates/tiki-admingroups.tpl	2009-11-03 17:43:12 UTC (rev 22839)
@@ -302,7 +302,8 @@
 				{/section}
 			</tr>
 		</table>
-		<div class="box">{$smarty.section.ix.total} {tr}users in group{/tr} {$groupname|escape}</div>
+		{pagination_links cant=$membersCount step=$prefs.maxRecords offset=$membersOffset offset_arg='membersOffset'}{/pagination_links}
+		<div class="box">{$membersCount} {tr}users in group{/tr} {$groupname|escape}</div>
 		<form method="post" action="tiki-admingroups.php">
 			<p>
 				<input type="hidden" name="group" value="{$groupname|escape}"/>

Modified: branches/4.x/tiki-admingroups.php
===================================================================
--- branches/4.x/tiki-admingroups.php	2009-11-03 17:34:00 UTC (rev 22838)
+++ branches/4.x/tiki-admingroups.php	2009-11-03 17:43:12 UTC (rev 22839)
@@ -222,7 +222,10 @@
 			$smarty->assign('hasOneIncludedGroup', "y");
 		}
 	}
-	$memberslist = $userlib->get_group_users($_REQUEST['group']);
+	if (!isset($_REQUEST['membersOffset'])) $_REQUEST['membersOffset'] = 0;
+	$memberslist = $userlib->get_group_users($_REQUEST['group'], $_REQUEST['membersOffset']);
+	$smarty->assign('membersCount', $userlib->count_users($_REQUEST['group']));
+	$smarty->assign('membersOffset', $_REQUEST['membersOffset']);
 	if ($cookietab == '1') $cookietab = "2";
 } else {
 	$allgroups = $userlib->list_all_groups();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.