[Cpan-forum-commit] rev 194 - in trunk: . lib/CPAN

[svn at pti.co.il]

Author: gabor
Date: 2006-08-29 15:44:40 +0300 (Tue, 29 Aug 2006)
New Revision: 194

Modified:
   trunk/
   trunk/lib/CPAN/Forum.pm
Log:
sort subscribers in abc



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 8c4c90e1-83eb-0310-96eb-e7cb62807872:/local/cpan-forum:11045
   + 8c4c90e1-83eb-0310-96eb-e7cb62807872:/local/cpan-forum:11057

Modified: trunk/lib/CPAN/Forum.pm
===================================================================
--- trunk/lib/CPAN/Forum.pm	2006-08-29 12:15:57 UTC (rev 193)
+++ trunk/lib/CPAN/Forum.pm	2006-08-29 12:44:40 UTC (rev 194)
@@ -1652,25 +1652,28 @@
     $self->set_ratings($t, $group_name);
     my $page = $q->param('page') || 1;
     $self->_search_results($t, {where => {gid => $gid}, page => $page});
-    $self->_subscriptions($t, $gid);
+    $self->_subscriptions($t, $gr);
     $t->output;
 }
 
 
 sub _subscriptions {
-    my ($self, $t, $gid) = @_;
+    my ($self, $t, $group) = @_;
 
+
     my %people;
     foreach my $s (
-            CPAN::Forum::Subscriptions->search(gid => $gid),
-            CPAN::Forum::Subscriptions_all->retrieve_all(),
+            CPAN::Forum::Subscriptions_all->search(allposts => 1),
+            CPAN::Forum::Subscriptions_pauseid->search(allposts => 1, pauseid => $group->pauseid),
+            CPAN::Forum::Subscriptions->search(allposts => 1, gid => $group->id),
             ) {
         $people{$s->uid} =  {
             username => $s->uid->username,
         };
     }
     if (%people) {
-        $t->param(users => [values %people]);
+        my @usernames = values %people;
+        $t->param(users => [sort {$a->{username} cmp $b->{username}} @usernames])
     }
 }