[vhffs-dev] [1931] probably fixed pager on public part

[subversion@xxxxxxxxxxxxx]

Revision: 1931
Author:   gradator
Date:     2012-01-24 20:29:03 +0100 (Tue, 24 Jan 2012)
Log Message:
-----------
probably fixed pager on public part

Modified Paths:
--------------
    trunk/vhffs-api/src/Vhffs/Panel/Public.pm

Modified: trunk/vhffs-api/src/Vhffs/Panel/Public.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Public.pm	2012-01-24 10:54:52 UTC (rev 1930)
+++ trunk/vhffs-api/src/Vhffs/Panel/Public.pm	2012-01-24 19:29:03 UTC (rev 1931)
@@ -140,7 +140,7 @@
 			exit(0);
 		}
 
-		my $pager = Vhffs::Panel::Commons::get_pager($page, $count, 10, 5, $panel->{url}, { groupname => $groupname, description => $description, included_tags => \@included_tags_ids, excluded_tags => \@excluded_tags_ids});
+		my $pager = Vhffs::Panel::Commons::get_pager($page, $count, 10, 5, $panel->{url}, { groupname => $groupname, description => $description, included_tags => \@included_tags_ids, excluded_tags => \@excluded_tags_ids, do => 'groupsearch' });
 
 		my $vars = {
 			groups => $groups,
@@ -155,7 +155,7 @@
 	my $query_string = '';
 
 	$query_string .= 'included_tags='.(join('&included_tags=', @included_tags_ids)) if(scalar(@included_tags_ids));
-	$query_string .= '&' if(scalar(@included_tags_ids) && scalar(@excluded_tags_ids));
+	$query_string .= '&' if(scalar(@included_tags_ids) and scalar(@excluded_tags_ids));
 	$query_string .= 'excluded_tags='.(join('&excluded_tags=', @excluded_tags_ids)) if(scalar(@excluded_tags_ids));
 
 	my $vars = {
@@ -265,7 +265,8 @@
 
 	my $result = Vhffs::Panel::Group::get_groups_starting_with( $vhffs , $letter, ($page - 1) *  $per_page_count, $per_page_count);
 	my $pager = Vhffs::Panel::Commons::get_pager($page, $result->{total_count}, $per_page_count, 5, $panel->{url}, {
-		'letter' => defined($letter) ? $letter : 'all'
+		letter => defined($letter) ? $letter : 'all',
+		do => 'allgroups'
 	});
 
 	my $vars = {
@@ -301,7 +302,7 @@
 			return;
 		}
 
-		my $pager = Vhffs::Panel::Commons::get_pager($page, $total, 10, 5, $panel->{url}, { username => $username });
+		my $pager = Vhffs::Panel::Commons::get_pager($page, $total, 10, 5, $panel->{url}, { username => $username, do => 'usersearch' });
 
 		$panel->render('content/usersearch-results.tt', {
 			users => $users,
@@ -384,7 +385,7 @@
 #	$url =~ s!tags/.*!tagsearch.pl!;
 
 	require URI::Escape;
-	my $pager = Vhffs::Panel::Commons::get_pager($page, $count, 10, 5, $url, { search => URI::Escape::uri_escape($search)});
+	my $pager = Vhffs::Panel::Commons::get_pager($page, $count, 10, 5, $url, { search => URI::Escape::uri_escape($search), do => 'tags' });
 
 	my $vars = {
 		groups => $groups,