Changeset 14

Timestamp:

02/20/07 23:43:38 (3 years ago)

Author:

eevee

Message:

Split forum flags into flags and accessibility; accessibility now controls, well, how accessible the forum is by default. 'Locked' means no new threads; 'archive' means no new threads or posts; 'hidden' means no new stuff and it's invisible. Permissions of 'override_forum_*' will (eventually) allow a user to bypass these restrictions per-forum.
This is only partially implemented; I will finish it up tomorrow or so.
Also started migrating from database slurping to iterators, one at a time. The changes are more related than they seem; I'm implementing some of the forum flags as extra search() calls, and if I slurp the results of the first search() immediately then I can't do another. Easiest way around this is to just make it an iterator and alter the templates slightly.
I also plan to do some general forum template refactoring, but that will come after this stuff actually works correctly.

Location:

veekun

Files:

• lib/Vee/Controller/Forum.pm (modified) (3 diffs)
• lib/Vee/Schema/Forums.pm (modified) (1 diff)
• lib/Vee/Utils/Forum.pm (modified) (1 diff)
• script/base.sql (modified) (1 diff)
• templates/forum/common.tt (modified) (2 diffs)
• templates/forum/index.tt (modified) (1 diff)
• templates/forum/view.tt (modified) (1 diff)

veekun/lib/Vee/Controller/Forum.pm

@@ -48 +48 @@
     $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} = $c->model('DBIC::Threads')->search_announcements;
+    $s->{forums}        = $c->model('DBIC::Forums')->search(undef, { prefetch => { lastpost => 'user' } });
+
+    $s->{can_see}       = sub { Vee::Authorization::has_permission($c, 'override_forum_hidden', shift) };
 
     $s->{template} = 'forum/index.tt';
@@ -76 +78 @@
     $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->{announcements} = $c->model('DBIC::Threads')->search_announcements;
     $s->{forum}         = $forum;
-    $s->{threads}       = [ $forum->search_related('threads', \ 'NOT FIND_IN_SET("deleted", me.flags)', {
+    $s->{threads}       = $forum->search_related('threads', undef, {
         order_by => 'FIND_IN_SET("sticky", me.flags) > 0 DESC, lastpost.time DESC',
         prefetch => { firstpost => 'user', lastpost => 'user' },
         offset => $skip,
         rows => $perpage,
-    } ) ];
+    } );
+    # 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 Vee::Authorization::has_permission($c, 'override_thread_deleted', $forum->id);
 
     $s->{template} = 'forum/view.tt';
@@ -106 +110 @@
         or $c->vee_abort('There is no thread with id ', $id, '.');
     $thread->hitct( $thread->hitct + 1 ); $thread->update;
+
+    if ($thread->flags =~ /deleted/ and not Vee::Authorization::has_permission($c, 'override_thread_deleted', $thread->forum->id)) {
+        $c->vee_abort('This thread has been deleted.');
+    }
 
     my $filter = $c->req->params->{filter};

veekun/lib/Vee/Schema/Forums.pm

@@ -10 +10 @@
 __PACKAGE__->load_components("PK::Auto", "Core");
 __PACKAGE__->table("forums");
-__PACKAGE__->add_columns("id", "name", "lastpostid", "threadct", "postct", "flags", "blurb");
+__PACKAGE__->add_columns("id", "name", "lastpostid", "threadct", "postct", "flags", "accessibility", "blurb");
 __PACKAGE__->set_primary_key("id");
 __PACKAGE__->add_unique_constraint(["id"], undef);

veekun/lib/Vee/Utils/Forum.pm

@@ -33 +33 @@
 }
 
-=head2 can_post
+=head2 can_thread
 
 Returns true if the current user can create threads in the given forum, false

veekun/script/base.sql

@@ -59 +59 @@
   threadct int(10) unsigned NOT NULL default '0',
   postct int(10) unsigned NOT NULL default '0',
-  flags set('locked','readonly','header','hidden') NOT NULL default '',
+  flags set('header') default NULL,
+  accessibility enum('normal','locked','archive','hidden') NOT NULL default 'normal',
   blurb varchar(255) NOT NULL default '',
   PRIMARY KEY  (id)

veekun/templates/forum/common.tt

@@ -60 +60 @@
 
 [% BLOCK show_announcements %][%# announcements %]
-[% RETURN UNLESS announcements AND announcements.size %]
+[% RETURN UNLESS announcements %]
 <h2>Announcements</h2>
 [% INCLUDE threads_start -%]
-[% FOREACH t IN announcements %]
+[% WHILE (t = announcements.next) %]
 [%     INCLUDE threads_each thread=t show_forum=1 %]
 [% END %]
@@ -179 +179 @@
 [%#     last_thread = sql.thread_info(last_post.threadid) -%]
 <tr><td class="forum-icon">
-<!-- TODO: something should go here. -->
+[% UNLESS forum.accessibility == 'normal' %]<img src="/images/icons/[% forum.accessibility %].png" alt="[% forum.accessibility %]" title="[% forum.accessibility %]"/>[% END %]
 </td><td class="forum-name">
 <a href="/forum/[% forum.id %]" class="forum-link">
- <div class="forum-title">
-[%     FOREACH flag IN ForumFlagArray %]
-[%         NEXT UNLESS forum.flags.match(flag.name) %]
-  <img src="/images/icons/[% flag.name %].png" alt="[% flag.name %]" title="[% flag.name %]: [% flag.blurb %]" class="forum-icon"/>
-[%     END %]
-[%     forum.name %]
- </div>
+ <div class="forum-title">[% forum.name %]</div>
 [%     IF forum.blurb %]
  <div class="forum-info">[% forum.blurb %]</div>

veekun/templates/forum/index.tt

@@ -10 +10 @@
 [% forum_flags %]
 [% INCLUDE forums_start %]
-[% FOREACH f IN forums %]
-[%     NEXT UNLESS f %]
+[% WHILE (f = forums.next) %]
+[%     NEXT IF f.accessibility == 'hidden' AND NOT can_see(f.id) %]
 [%     IF f.flags.match('header') %]
-[%         INCLUDE forums_header title=f.name blurb=f.blurb %]
+[%         prev_header = f %]
 [%     ELSE %]
+[%         INCLUDE forums_header title=prev_header.name blurb=prev_header.blurb IF prev_header %]
 [%         INCLUDE forums_each forum=f %]
 [%     END %]

veekun/templates/forum/view.tt

@@ -13 +13 @@
 [% forum_flags %]
 [% INCLUDE threads_start %]
-[% FOREACH t IN threads %]
+[% WHILE (t = threads.next) %]
 [%     INCLUDE threads_each thread=t %]
 [% END %]