Changeset 197

Timestamp:

07/10/03 23:04:05 (6 years ago)

Author:

kake

Message:

Prefs option to show minor changes

Location:

trunk

Files:

• Changes (modified) (1 diff)
• lib/OpenGuides/CGI.pm (modified) (4 diffs)
• preferences.cgi (modified) (2 diffs)
• t/13_cookies.t (modified) (4 diffs)
• templates/preferences.tt (modified) (2 diffs)
• wiki.cgi (modified) (1 diff)

trunk/Changes

@@ -9 +9 @@
           in your config file.
         Added config option for including the navbar on the home page.
+        Implemented minor edits.
 
 0.18    16 June 2003

trunk/lib/OpenGuides/CGI.pm

@@ -33 +33 @@
       latlong_traditional    => 1,
       omit_formatting_link   => 1,
+      show_minor_edits_in_rc => 1,
   );
 
@@ -60 +61 @@
       latlong_traditional    => 1,
       omit_formatting_link   => 1,
+      show_minor_edits_in_rc => 1,
   );
 
@@ -74 +76 @@
     my $cookie = CGI::Cookie->new(
         -name  => $cookie_name,
-        -value => { user   => $args{username},
-                    gclink => $args{include_geocache_link},
-                    prevab => $args{preview_above_edit_box},
-                    lltrad => $args{latlong_traditional},
+        -value => { user      => $args{username},
+                    gclink    => $args{include_geocache_link},
+                    prevab    => $args{preview_above_edit_box},
+                    lltrad    => $args{latlong_traditional},
                     omitfmtlk => $args{omit_formatting_link},
+                    rcmined   => $args{show_minor_edits_in_rc},
                   },
         -expires => "+1M",
@@ -112 +115 @@
              latlong_traditional    => $data{lltrad}    || 0,
              omit_formatting_link   => $data{omitfmtlk} || 0,
+             show_minor_edits_in_rc => $data{rcmined}   || 0,
            );
 }

trunk/preferences.cgi

@@ -27 +27 @@
     my $latlong_trad = $cgi->param("latlong_traditional")    || 0;
     my $omit_fmt_lnk = $cgi->param("omit_formatting_link")   || 0;
+    my $rc_minor_eds = $cgi->param("show_minor_edits_in_rc") || 0;
     my $cookie = OpenGuides::CGI->make_prefs_cookie(
         config => $config,
         username => $username,
-        include_geocache_link => $gc_link,
+        include_geocache_link  => $gc_link,
         preview_above_edit_box => $pre_above,
-        latlong_traditional => $latlong_trad,
-        omit_formatting_link => $omit_fmt_lnk,
+        latlong_traditional    => $latlong_trad,
+        omit_formatting_link   => $omit_fmt_lnk,
+        show_minor_edits_in_rc => $rc_minor_eds,
     );
     print OpenGuides::Template->output(
@@ -45 +47 @@
                       preview_above_edit_box => $pre_above,
                       latlong_traditional    => $latlong_trad,
-                      omit_formatting_link   => $omit_fmt_lnk
+                      omit_formatting_link   => $omit_fmt_lnk,
+                      show_minor_edits_in_rc => $rc_minor_eds,
                     }
     );

trunk/t/13_cookies.t

@@ -1 +1 @@
 use strict;
 use Config::Tiny;
-use Test::More tests => 15;
+use Test::More tests => 16;
 
 use_ok( "OpenGuides::CGI" );
@@ -23 +23 @@
     latlong_traditional    => 1,
     omit_formatting_link   => 1,
+    show_minor_edits_in_rc => 1,
 );
 isa_ok( $cookie, "CGI::Cookie", "->make_prefs_cookie returns a cookie" );
@@ -44 +45 @@
 is( $prefs{latlong_traditional}, 1, "...and latlong prefs" );
 is( $prefs{omit_formatting_link}, 1, "...and formatting link prefs" );
+is( $prefs{show_minor_edits_in_rc}, 1, "...and minor edits prefs" );
 
 # Check that cookie parsing fails nicely if no cookie set.
@@ -49 +51 @@
 %prefs = eval { OpenGuides::CGI->get_prefs_from_cookie( config => $config ); };
 is( $@, "", "->get_prefs_from_cookie doesn't die if no cookie set" );
-is( keys %prefs, 5, "...and returns five default values" );
+is( keys %prefs, 6, "...and returns six default values" );
 

trunk/templates/preferences.tt

@@ -60 +60 @@
     [% END %]
 
+    <p>
+    [% IF show_minor_edits_in_rc %]
+      <input type="checkbox" name="show_minor_edits_in_rc" value="1" checked />
+    [% ELSE %]
+      <input type="checkbox" name="show_minor_edits_in_rc" value="1" />
+    [% END %]
+    Include &#8220;minor edits&#8221; in Recent Changes.
+    </p>
+
     <input type="submit" value="Set it" class="form_button" />
     <input type="hidden" name="action" value="set_preferences">
@@ -96 +105 @@
   [% END %]
 
+  <p>Minor edits
+    [% UNLESS show_minor_edits_in_rc %] not [% END %]
+  included in Recent Changes.</p>
+
   <p><a href="[% full_cgi_url %]">Return to the wiki</a></p>
 

trunk/wiki.cgi

@@ -239 +239 @@
 
     if ($node eq "RecentChanges") {
-        my @recent = $wiki->list_recent_changes( days => 7 );
+        my $minor_edits = get_cookie( "show_minor_edits_in_rc" );
+        my %criteria = ( days => 7 );
+        $criteria{metadata_isnt} = { edit_type => "Minor tidying" }
+          unless $minor_edits;
+        my @recent = $wiki->list_recent_changes( %criteria );
         @recent = map { {name          => $q->escapeHTML($_->{name}),
                          last_modified => $q->escapeHTML($_->{last_modified}),