Changeset 394

Timestamp:

06/09/07 20:15:56 (6 years ago)

Author:

ivorw

Message:

Add support for only seeing recent changes that are moderated.

Location:

wiki-toolkit/trunk

Files:

• Changes (modified) (1 diff)
• lib/Wiki/Toolkit.pm (modified) (1 diff)
• lib/Wiki/Toolkit/Store/Database.pm (modified) (4 diffs)
• t/022_list_unmoderated.t (modified) (2 diffs)

wiki-toolkit/trunk/Changes

@@ +1 @@
+0.75    9  June 2007
+        Support for selecting versions by moderation status (see OpenGuides
+        ticket #142)
+
 0.74    9  June 2007
         Added list_last_version_before method, to get the version of all the

wiki-toolkit/trunk/lib/Wiki/Toolkit.pm

@@ -4 +4 @@
 
 use vars qw( $VERSION );
-$VERSION = '0.74';
+$VERSION = '0.75';
 
 use Carp qw(croak carp);

wiki-toolkit/trunk/lib/Wiki/Toolkit/Store/Database.pm

@@ -12 +12 @@
 use Digest::MD5 qw( md5_hex );
 
-$VERSION = '0.28';
+$VERSION = '0.29';
 my $SCHEMA_VER = 9;
 
@@ -1192 +1192 @@
 (integer), C<since> (epoch), C<last_n_changes> (integer).
 
+You I<may> also supply moderation => 1 if you only want to see versions
+that are moderated.
+
 You I<may> also supply I<either> C<metadata_is> (and optionally
 C<metadata_isnt>), I<or> C<metadata_was> (and optionally
@@ -1257 +1260 @@
     my ($self, %args) = @_;
     my ($since, $limit, $between_days, $ignore_case,
-        $metadata_is,  $metadata_isnt, $metadata_was, $metadata_wasnt ) =
+        $metadata_is,  $metadata_isnt, $metadata_was, $metadata_wasnt,
+        $moderation ) =
          @args{ qw( since limit between_days ignore_case
-                    metadata_is metadata_isnt metadata_was metadata_wasnt) };
+                    metadata_is metadata_isnt metadata_was metadata_wasnt
+                    moderation ) };
     my $dbh = $self->dbh;
 
@@ -1278 +1283 @@
                                  . "=$mdt.node_id
                                  AND $main_table.version=$mdt.version\n";
+                if (defined $moderation) {
+                    push @metadata_joins, "AND $main_table.moderate=$moderation";
+                }
                 push @where, "( "
                          . $self->_get_comparison_sql(

wiki-toolkit/trunk/t/022_list_unmoderated.t

@@ -7 +7 @@
     plan skip_all => "no backends configured";
 } else {
-    plan tests => ( 31 * scalar @Wiki::Toolkit::TestLib::wiki_info );
+    plan tests => ( 40 * scalar @Wiki::Toolkit::TestLib::wiki_info );
 }
 
@@ -109 +109 @@
 
         is_deeply( $new_mod_nodes[0], \%m21, "Should have right data" );
+        
+        my @rc_mod_nodes = $wiki->list_recent_changes( days => 7,
+                                                 moderation => 1);
+
+#       use Data::Dumper;
+#       open (my $dbug, '>', 'dbug.out') or die 'Failed to write debug';
+#       print $dbug Dumper(\@rc_mod_nodes);
+
+        is( scalar(@rc_mod_nodes), 4, "Count of recent changes nodes");
+        is( $rc_mod_nodes[0]{name}, 'Home', "RC node 0 name" );
+        is( $rc_mod_nodes[0]{version}, 2, "RC node 0 version" );
+        is( $rc_mod_nodes[1]{name}, 'Moderation', "RC node 1 name" );
+        is( $rc_mod_nodes[1]{version}, 1, "RC node 1 version" );
+        is( $rc_mod_nodes[2]{name}, 'Moderation2', "RC node 2 name" );
+        is( $rc_mod_nodes[2]{version}, 1, "RC node 2 version" );
+        is( $rc_mod_nodes[3]{name}, 'Moderation3', "RC node 3 name" );
+        is( $rc_mod_nodes[3]{version}, 2, "RC node 3 version" );
 }
+