Changeset 24

Timestamp:

02/26/07 00:20:14 (23 months ago)

Author:

eevee

Message:

Little bugfixes:
Renamed a few more iterators to have a _rs suffix.
Added a semicolon I forgot. Oops.
Deleted index.tt.old while I was at it.
Fixed: I was still using .size checking on announcement and thread and forum iterators.
Possibly an erroneous pipe on the recent users list on the front page?

Location:

veekun

Files:

• lib/Vee/Controller/Forum.pm (modified) (3 diffs)
• lib/Vee/Controller/Forum/Create.pm (modified) (1 diff)
• templates/forum/common.tt (modified) (1 diff)
• templates/forum/index.tt (modified) (2 diffs)
• templates/forum/view.tt (modified) (2 diffs)
• templates/index.tt (modified) (1 diff)
• templates/index.tt.old (deleted)

veekun/lib/Vee/Controller/Forum.pm

@@ -52 +52 @@
     $s->{extra_css}  = 'forum';
 
-    $s->{announcements} = $c->model('DBIC::Threads')->search_announcements;
-    $s->{forums}        = $c->model('DBIC::Forums')->search(undef, { prefetch => { lastpost => 'user' } });
+    $s->{announcements_rs} = $c->model('DBIC::Threads')->search_announcements;
+    $s->{forums_rs}        = $c->model('DBIC::Forums')->search(undef, { prefetch => { lastpost => 'user' } });
 
     $s->{template} = 'forum/index.tt';
@@ -80 +80 @@
     $s->{crumbs}      = [ '<a href="/forum">Forum Index</a>', '<a href="/forum/'.$forum->id.'">'.$forum->name.'</a>' ];
 
-    $s->{announcements} = $c->model('DBIC::Threads')->search_announcements;
-    $s->{forum}         = $forum;
-    $s->{threads}       = $forum->search_related('threads', undef, {
+    $s->{announcements_rs} = $c->model('DBIC::Threads')->search_announcements;
+    $s->{forum}            = $forum;
+    $s->{threads_rs}       = $forum->search_related('threads', undef, {
         order_by => 'FIND_IN_SET("sticky", me.flags) > 0 DESC, lastpost.time DESC',
         prefetch => { firstpost => 'user', lastpost => 'user' },
@@ -89 +89 @@
     } );
     # TODO: ugly but for now I don't know the best way to clean it up
-    $s->{threads} = $s->{threads}->search(\ 'NOT FIND_IN_SET("deleted", me.flags)') unless $c->can_i(override_thread_deleted => $forum->id);
+    $s->{threads_rs}       = $s->{threads_rs}->search(\ 'NOT FIND_IN_SET("deleted", me.flags)') unless $c->can_i(override_thread_deleted => $forum->id);
 
     $s->{template} = 'forum/view.tt';

veekun/lib/Vee/Controller/Forum/Create.pm

@@ -105 +105 @@
             $thread->lastpostid( $last_post->id );
             $thread->lasttime( time );
-            $thread->update
+            $thread->update;
 
             return $last_post;

veekun/templates/forum/common.tt

@@ -59 +59 @@
 <!-- show_announcements: print out the announcement list at the top of a forum page -->
 
-[% BLOCK show_announcements %][%# announcements %]
-[% RETURN UNLESS announcements %]
+[% BLOCK show_announcements %][%# announcements_rs %]
+[% RETURN UNLESS announcements_rs.first %]
+[% CALL announcements_rs.reset %]
 <h2>Announcements</h2>
 [% INCLUDE threads_start -%]
-[% WHILE (t = announcements.next) %]
+[% WHILE (t = announcements_rs.next) %]
 [%     INCLUDE threads_each thread=t show_forum=1 %]
 [% END %]
 [% INCLUDE threads_end %]
-<hr/>
+<h2>Threads</h2>
 [%+ END %]
 

veekun/templates/forum/index.tt

@@ -1 +1 @@
 [% PROCESS 'forum/common.tt' %]
 
-[% INCLUDE show_announcements %]
+[% INCLUDE show_announcements announcements_rs=announcements_rs %]
 [% forum_flags = BLOCK %]
 [%     FOREACH flag IN forum.flags.split(',') %]
@@ -10 +10 @@
 [% forum_flags %]
 [% INCLUDE forums_start %]
-[% WHILE (f = forums.next) %]
-[%     NEXT IF f.accessibility == 'hidden' AND NOT c.can_i('override_forum_hidden', f.id) %]
-[%     IF f.flags.match('header') %]
-[%         prev_header = f %]
-[%     ELSE %]
-[%         INCLUDE forums_header title=prev_header.name blurb=prev_header.blurb IF prev_header %]
-[%         INCLUDE forums_each forum=f %]
+[% IF NOT forums_rs.first %]
+[%     INCLUDE forums_message message='Either no forums exist, or all existing forums are blocked from your view.' %]
+[% ELSE %]
+[%     CALL forums_rs.reset %]
+[%     WHILE (f = forums_rs.next) %]
+[%         NEXT IF f.accessibility == 'hidden' AND NOT c.can_i('override_forum_hidden', f.id) %]
+[%         IF f.flags.match('header') %]
+[%             prev_header = f %]
+[%         ELSE %]
+[%             INCLUDE forums_header title=prev_header.name blurb=prev_header.blurb IF prev_header %]
+[%             INCLUDE forums_each forum=f %]
+[%         END %]
 [%     END %]
 [% END %]
-[% INCLUDE forums_message message='Either no forums exist, or all existing forums are blocked from your view.' UNLESS forums.size %]
 [% INCLUDE forums_end %]
 [% forum_flags %]

veekun/templates/forum/view.tt

@@ -4 +4 @@
 [% IF forum.blurb %]<div class="forum-blurb">[% forum.blurb %]</div>[% END %]
 [% this_pagelist = pagelist(skip, c.site_opts.page_sizes.threads, forum.threadct, c.uri('Forum', 'forum', forum.id), c.req.params); this_pagelist %]
-[% INCLUDE show_announcements announcements=announcements %]
+[% INCLUDE show_announcements announcements_rs=announcements_rs %]
 [% forum_flags = BLOCK %]
 [%     FOREACH flag IN forum.flags.split(',') %]
@@ -13 +13 @@
 [% forum_flags %]
 [% INCLUDE threads_start %]
-[% WHILE (t = threads.next) %]
-[%     INCLUDE threads_each thread=t %]
+[% IF NOT threads_rs.first %]
+[%     INCLUDE threads_message message='Either no threads exist, or all existing threads are blocked from your view.' %]
+[% ELSE %]
+[%     CALL threads_rs.reset %]
+[%     WHILE (t = threads_rs.next) %]
+[%         INCLUDE threads_each thread=t %]
+[%     END %]
 [% END %]
-[% INCLUDE threads_message message='Either no threads exist, or all existing threads are blocked from your view.' UNLESS threads.size %]
 [% INCLUDE threads_end %]
 [% forum_flags %]

veekun/templates/index.tt

@@ -50 +50 @@
    <p> Recent users:
 [% now = time %]
+[% last_user = 0 %]
 [% WHILE (u = recent_users.next) %]
 [%#     IF NOT done_user_sep AND last_user AND last_user.lastactive < now - 600; done_user_set = 1 %] | [%# END %]