openguides-commits August 2006

openguides-commits@lists.openguides.org

1 participants
24 discussions

r836 - in trunk: . lib lib/OpenGuides templates
by svnadmin＠urchin.earth.li 10 Aug '06

10 Aug '06

Author: nick Date: 2006-08-10 18:05:11 +0100 (Thu, 10 Aug 2006) New Revision: 836 Modified: trunk/Changes trunk/lib/OpenGuides.pm trunk/lib/OpenGuides/Config.pm trunk/templates/moderate_confirm.tt Log: Allow the option of moderating nodes without the password Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-08-10 16:55:37 UTC (rev 835) +++ trunk/Changes 2006-08-10 17:05:11 UTC (rev 836) @@ -3,6 +3,7 @@ Lots more Atom and RSS feeds, including for searching Admin interface Nodes missing metadata interface + Moderation support (based on Wiki::Toolkit moderation) 0.56 14 June 2006 Fix bug introduced in feed formatting where Atom feeds would be Modified: trunk/lib/OpenGuides/Config.pm =================================================================== --- trunk/lib/OpenGuides/Config.pm 2006-08-10 16:55:37 UTC (rev 835) +++ trunk/lib/OpenGuides/Config.pm 2006-08-10 17:05:11 UTC (rev 836) @@ -12,7 +12,7 @@ formatting_rules_node formatting_rules_link backlinks_in_title template_path custom_template_path geo_handler ellipsoid gmaps_api_key centre_long centre_lat default_gmaps_zoom default_gmaps_search_zoom force_wgs84 - licence_name licence_url licence_info_url + licence_name licence_url licence_info_url moderation_requires_password ); my @questions = map { $_ . "__qu" } @variables; OpenGuides::Config->mk_accessors( @variables ); Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-08-10 16:55:37 UTC (rev 835) +++ trunk/lib/OpenGuides.pm 2006-08-10 17:05:11 UTC (rev 836) @@ -1272,6 +1272,9 @@ ); my $password = $args{password}; + unless($self->config->moderation_requires_password) { + $password = $self->config->admin_pass; + } if ($password) { if ($password ne $self->config->admin_pass) { Modified: trunk/templates/moderate_confirm.tt =================================================================== --- trunk/templates/moderate_confirm.tt 2006-08-10 16:55:37 UTC (rev 835) +++ trunk/templates/moderate_confirm.tt 2006-08-10 17:05:11 UTC (rev 836) @@ -12,12 +12,10 @@ <p> [% IF moderation_action == 'set_moderation' %] You are about to change the moderation flag on - <span class="node_name">[% node_name %]</span>. [% ELSE %] You are about to moderate a version of - <span class="node_name">[% node_name %]</span>. - completely erase this page and all its history. [% END %] +<span class="node_name">[% node_name %]</span>. To do so, please enter the admin password. If not, you can <a href="[% cgi_url %]?action=admin">go back to the admin page</a>. </p>

1 0

r835 - trunk/templates
by svnadmin＠urchin.earth.li 10 Aug '06

10 Aug '06

Author: nick Date: 2006-08-10 17:55:37 +0100 (Thu, 10 Aug 2006) New Revision: 835 Modified: trunk/templates/admin_home.tt Log: Add css classes to bits of the admin page Modified: trunk/templates/admin_home.tt =================================================================== --- trunk/templates/admin_home.tt 2006-08-10 16:48:35 UTC (rev 834) +++ trunk/templates/admin_home.tt 2006-08-10 16:55:37 UTC (rev 835) @@ -21,12 +21,13 @@ <tr><th>Node name</th><th>Current Version</th><th>Moderation</th><th>Actions</th></tr> [% FOREACH node = nodes %] <tr> - <td><a href="[% node.view_url %]">[% node.name %]</a></td> - <td>[% node.version %]</td> - <td>[% IF node.moderate %]yes[% ELSE %]no[% END %]</td> - <td><a href="[% node.view_url %]">View</a> or - <a href="[% node.versions_url %]">View all versions</a> or - <a href="[% node.moderation_url %]">Set Moderation</a> + <td class="admin_name"><a href="[% node.view_url %]">[% node.name %]</a></td> + <td class="admin_version">[% node.version %]</td> + <td class="admin_moderate">[% IF node.moderate %]yes[% ELSE %]no[% END %]</td> + <td class="admin_action"> + <a href="[% node.view_url %]">View</a> or + <a href="[% node.versions_url %]">View all versions</a> or + <a href="[% node.moderation_url %]">Set Moderation</a> </td> </tr> [% END %] @@ -39,12 +40,13 @@ <tr><th>Locale name</th><th>Current Version</th><th>Moderation</th><th>Actions</th></tr> [% FOREACH locale = locales %] <tr> - <td><a href="[% locale.view_url %]">[% locale.name %]</a></td> - <td>[% locale.version %]</td> - <td>[% locale.moderate %]</td> - <td><a href="[% locale.view_url %]">View</a> or - <a href="[% locale.versions_url %]">View all versions</a> or - <a href="[% locale.moderation_url %]">Set Moderation</a> + <td class="admin_name"><a href="[% locale.view_url %]">[% locale.name %]</a></td> + <td class="admin_version">[% locale.version %]</td> + <td class="admin_moderate">[% IF node.moderate %]yes[% ELSE %]no[% END %]</td> + <td class="admin_action"> + <a href="[% locale.view_url %]">View</a> or + <a href="[% locale.versions_url %]">View all versions</a> or + <a href="[% locale.moderation_url %]">Set Moderation</a> </td> </tr> [% END %] @@ -57,12 +59,13 @@ <tr><th>Category name</th><th>Current Version</th><th>Moderation</th><th>Actions</th></tr> [% FOREACH cat = categories %] <tr> - <td><a href="[% cat.view_url %]">[% cat.name %]</a></td> - <td>[% cat.version %]</td> - <td>[% cat.moderate %]</td> - <td><a href="[% cat.view_url %]">View</a> or - <a href="[% cat.versions_url %]">View all versions</a> or - <a href="[% cat.moderation_url %]">Set Moderation</a> + <td class="admin_name"><a href="[% cat.view_url %]">[% cat.name %]</a></td> + <td class="admin_version">[% cat.version %]</td> + <td class="admin_moderate">[% IF node.moderate %]yes[% ELSE %]no[% END %]</td> + <td class="admin_action"> + <a href="[% cat.view_url %]">View</a> or + <a href="[% cat.versions_url %]">View all versions</a> or + <a href="[% cat.moderation_url %]">Set Moderation</a> </td> </tr> [% END %]

1 0

r834 - in trunk: . lib templates
by svnadmin＠urchin.earth.li 10 Aug '06

10 Aug '06

Author: nick Date: 2006-08-10 17:48:35 +0100 (Thu, 10 Aug 2006) New Revision: 834 Modified: trunk/lib/OpenGuides.pm trunk/templates/admin_home.tt trunk/wiki.cgi Log: Display a confirmation message after moderation actions Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-08-10 16:22:53 UTC (rev 833) +++ trunk/lib/OpenGuides.pm 2006-08-10 16:48:35 UTC (rev 834) @@ -1267,8 +1267,8 @@ not_deletable => 1, deter_robots => 1, version => $version, - moderation_action => 'moderate_node', - moderation_url_args => 'action=moderate_node&version='.$version + moderation_action => 'moderate', + moderation_url_args => 'action=moderate&version='.$version ); my $password = $args{password}; @@ -1443,14 +1443,26 @@ } } + # Handle completed notice for actions + my $completed_action = ""; + if($args{moderation_completed}) { + if($args{moderation_completed} eq "moderation") { + $completed_action = "Version Moderated"; + } + if($args{moderation_completed} eq "changed") { + $completed_action = "Node Moderate Flag Changed"; + } + } + # Render in a template my %tt_vars = ( not_editable => 1, not_deletable => 1, deter_robots => 1, - nodes => \@nodes, + nodes => \@nodes, categories => \@categories, - locales => \@locales + locales => \@locales, + completed_action => $completed_action ); return %tt_vars if $return_tt_vars; my $output = $self->process_template( Modified: trunk/templates/admin_home.tt =================================================================== --- trunk/templates/admin_home.tt 2006-08-10 16:22:53 UTC (rev 833) +++ trunk/templates/admin_home.tt 2006-08-10 16:48:35 UTC (rev 834) @@ -3,6 +3,10 @@ <div id="content"> [% INCLUDE navbar.tt %] <div id="maincontent"> +[% IF completed_action %] + <br /> + <div style="color: #A0C745">[% completed_action %]</div> +[% END %] <h2>Site Administration</h2> <ul> <li><a href="#nodes">Nodes</a></li> Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2006-08-10 16:22:53 UTC (rev 833) +++ trunk/wiki.cgi 2006-08-10 16:48:35 UTC (rev 834) @@ -83,7 +83,9 @@ metres => $q->param("distance_in_metres") ); } elsif ( $action eq 'admin' ) { - $guide->display_admin_interface(); + $guide->display_admin_interface( + moderation_completed => $q->param("moderation"), + ); } elsif ( $action eq 'show_missing_metadata' ) { $guide->show_missing_metadata( metadata_type => $q->param("metadata_type") || "",

1 0

r833 - in trunk: . lib t
by svnadmin＠urchin.earth.li 10 Aug '06

10 Aug '06

Author: nick Date: 2006-08-10 17:22:53 +0100 (Thu, 10 Aug 2006) New Revision: 833 Added: trunk/t/72_node_moderation.t Modified: trunk/MANIFEST trunk/lib/OpenGuides.pm Log: Finish moderation support Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2006-08-10 15:02:47 UTC (rev 832) +++ trunk/MANIFEST 2006-08-10 16:22:53 UTC (rev 833) @@ -104,6 +104,7 @@ t/68_bug_website_displayed.t t/70_admin_home.t t/71_missing_metadata.t +t/72_node_moderation.t t/73_toggle_moderation.t t/templates/15_test.tt wiki.cgi Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-08-10 15:02:47 UTC (rev 832) +++ trunk/lib/OpenGuides.pm 2006-08-10 16:22:53 UTC (rev 833) @@ -988,29 +988,13 @@ if $metadata{longitude_unmunged}; # Check to make sure all the indexable nodes are created - # TODO: Split this off into another function - # TODO: Don't run this if the node requires moderation (only do it after someone moderates) - foreach my $type (qw(Category Locale)) { - my $lctype = lc($type); - foreach my $index (@{$metadata{$lctype}}) { - $index =~ s/(.*)/\u$1/; - my $node = $type . " " . $index; - # Uppercase the node name before checking for existence - $node =~ s/ (\S+)/ \u$1/g; - unless ( $wiki->node_exists($node) ) { - my $category = $type eq "Category" ? "Category" : "Locales"; - $wiki->write_node( - $node, - "\@INDEX_LINK [[$node]]", - undef, - { - username => "Auto Create", - comment => "Auto created $lctype stub page", - category => $category - } - ); - } - } + # Skip this for nodes needing moderation - this occurs for them once + # they've been moderated + unless($wiki->node_required_moderation($node)) { + $self->_autoCreateCategoryLocale( + id => $node, + metadata => \%metadata + ); } foreach my $var ( qw( summary username comment edit_type ) ) { @@ -1060,7 +1044,52 @@ } } +=item B<_autoCreateCategoryLocale> + $guide->_autoCreateCategoryLocale( + id => "FAQ", + metadata => \%metadata, + ); + +When a new node is added, or a previously un-moderated node is moderated, +identifies if any of its Categories or Locales are missing, and creates them. + +For nodes not requiring moderation, should be called on writing the node +For nodes requiring moderation, should only be called on moderation +=cut +sub _autoCreateCategoryLocale { + my ($self, %args) = @_; + + my $wiki = $self->wiki; + my $id = $args{'id'}; + my %metadata = %{$args{'metadata'}}; + + # Check to make sure all the indexable nodes are created + foreach my $type (qw(Category Locale)) { + my $lctype = lc($type); + foreach my $index (@{$metadata{$lctype}}) { + $index =~ s/(.*)/\u$1/; + my $node = $type . " " . $index; + # Uppercase the node name before checking for existence + $node =~ s/ (\S+)/ \u$1/g; + unless ( $wiki->node_exists($node) ) { + my $category = $type eq "Category" ? "Category" : "Locales"; + $wiki->write_node( + $node, + "\@INDEX_LINK [[$node]]", + undef, + { + username => "Auto Create", + comment => "Auto created $lctype stub page", + category => $category + } + ); + } + } + } +} + + =item B<delete_node> $guide->delete_node( @@ -1211,6 +1240,85 @@ } } +=item B<moderate_node> + + $guide->moderate_node( + id => "FAQ", + version => 12, + password => "beer", + ); + +Marks a version of a node as moderated. Will also auto-create and Locales +and Categories for the newly moderated version. + +If C<password> is not supplied then a form for entering the password +will be displayed. +=cut +sub moderate_node { + my ($self, %args) = @_; + my $node = $args{id} or croak "No node ID supplied for node moderation"; + my $version = $args{version} or croak "No node version supplied for node moderation"; + my $return_tt_vars = $args{return_tt_vars} || 0; + my $return_output = $args{return_output} || 0; + + # Set up the TT variables + my %tt_vars = ( + not_editable => 1, + not_deletable => 1, + deter_robots => 1, + version => $version, + moderation_action => 'moderate_node', + moderation_url_args => 'action=moderate_node&version='.$version + ); + + my $password = $args{password}; + + if ($password) { + if ($password ne $self->config->admin_pass) { + return %tt_vars if $return_tt_vars; + my $output = $self->process_template( + id => $node, + template => "moderate_password_wrong.tt", + tt_vars => \%tt_vars, + ); + return $output if $return_output; + print $output; + } else { + $self->wiki->moderate_node( + name => $node, + version => $version + ); + + # Create any categories or locales for it + my %details = $self->wiki->retrieve_node( + name => $node, + version => $version + ); + $self->_autoCreateCategoryLocale( + id => $node, + metadata => $details{'metadata'} + ); + + # Send back to the admin interface + my $script_url = $self->config->script_url; + my $script_name = $self->config->script_name; + my $q = CGI->new; + my $output = $q->redirect( $script_url.$script_name."?action=admin&moderation=moderated" ); + return $output if $return_output; + print $output; + } + } else { + return %tt_vars if $return_tt_vars; + my $output = $self->process_template( + id => $node, + template => "moderate_confirm.tt", + tt_vars => \%tt_vars, + ); + return $output if $return_output; + print $output; + } +} + =item B<show_missing_metadata> Search for nodes which don't have a certain kind of metadata. Optionally also excludes Locales and Categories Added: trunk/t/72_node_moderation.t =================================================================== --- trunk/t/72_node_moderation.t 2006-08-10 15:02:47 UTC (rev 832) +++ trunk/t/72_node_moderation.t 2006-08-10 16:22:53 UTC (rev 833) @@ -0,0 +1,117 @@ +use strict; +use Wiki::Toolkit::Setup::SQLite; +use OpenGuides; +use OpenGuides::Test; +use Test::More tests => 19; + +eval { require DBD::SQLite; }; +my $have_sqlite = $@ ? 0 : 1; + +SKIP: { + skip "DBD::SQLite not installed - no database to test with", 19 + unless $have_sqlite; + + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + my $config = OpenGuides::Test->make_basic_config; + $config->script_name( "wiki.cgi" ); + $config->script_url( "http://example.com/" ); + my $guide = OpenGuides->new( config => $config ); + isa_ok( $guide, "OpenGuides" ); + my $wiki = $guide->wiki; + isa_ok( $wiki, "Wiki::Toolkit" ); + + # Clear out the database from any previous runs. + foreach my $del_node ( $wiki->list_all_nodes ) { + print "# Deleting node $del_node\n"; + $wiki->delete_node( $del_node ) or die "Can't delete $del_node"; + } + + + # Add a page + my $q = CGI->new; + $q->param( -name => "content", -value => "foo" ); + $q->param( -name => "categories", -value => "Alpha" ); + $q->param( -name => "locales", -value => "" ); + $q->param( -name => "phone", -value => "" ); + $q->param( -name => "fax", -value => "" ); + $q->param( -name => "website", -value => "" ); + $q->param( -name => "hours_text", -value => "" ); + $q->param( -name => "address", -value => "" ); + $q->param( -name => "postcode", -value => "" ); + $q->param( -name => "map_link", -value => "" ); + $q->param( -name => "os_x", -value => "" ); + $q->param( -name => "os_y", -value => "" ); + $q->param( -name => "username", -value => "bob" ); + $q->param( -name => "comment", -value => "foo" ); + $q->param( -name => "edit_type", -value => "Minor tidying" ); + $ENV{REMOTE_ADDR} = "127.0.0.1"; + + my $output = $guide->commit_node( + return_output => 1, + id => "Wombats", + cgi_obj => $q, + ); + + # Check it's moderated + my %details = $wiki->retrieve_node("Wombats"); + is($details{'moderated'}, 1, "Moderated"); + is($wiki->node_required_moderation("Wombats"), 0, "No moderation"); + + # Turn on moderation + $wiki->set_node_moderation( + name => "Wombats", + required => 1, + ); + is($wiki->node_required_moderation("Wombats"), 1, "Moderation"); + + + # Now add a new one, with new categories and locales + $q->param( -name => "categories", -value => "Alpha\r\nBeta" ); + $q->param( -name => "locales", -value => "Hello" ); + $q->param( -name => "edit_type", -value => "Normal edit" ); + $q->param( -name => "checksum", -value => $details{checksum} ); + my $output = $guide->commit_node( + return_output => 1, + id => "Wombats", + cgi_obj => $q, + ); + + # Check that the current version is still 1 + %details = $wiki->retrieve_node("Wombats"); + is($details{'version'}, 1, "Still on v1"); + is($details{'moderated'}, 1, "v1 Moderated"); + + # Check that version 2 isn't moderated + my %v2 = $wiki->retrieve_node(name=>"Wombats",version=>2); + is($v2{'version'}, 2, "Is v2"); + is($v2{'moderated'}, 0, "Not moderated"); + + # Check that the new categories and locales aren't there + is(1, $wiki->node_exists("Category Alpha"), "Right Categories"); + is(0, $wiki->node_exists("Category Beta"), "Right Categories"); + is(0, $wiki->node_exists("Locale Hello"), "Right Locales"); + + + # Moderate + $guide->moderate_node( + id => "Wombats", + version => 2, + password => $guide->config->admin_pass + ); + + + # Check that the current version is 2 + %details = $wiki->retrieve_node(name=>"Wombats"); + is($details{'version'}, 2, "Is v2"); + is($details{'moderated'}, 1, "Moderated"); + + # Check that version 2 is moderated + %v2 = $wiki->retrieve_node(name=>"Wombats",version=>2); + is($v2{'version'}, 2, "Is v2"); + is($v2{'moderated'}, 1, "Moderated"); + + # Check that the new categories and locales exist + is(1, $wiki->node_exists("Category Alpha"), "Right Categories"); + is(1, $wiki->node_exists("Category Beta"), "Right Categories"); + is(1, $wiki->node_exists("Locale Hello"), "Right Locales"); +}

1 0

r832 - in trunk: . t
by svnadmin＠urchin.earth.li 10 Aug '06

10 Aug '06

Author: nick Date: 2006-08-10 16:02:47 +0100 (Thu, 10 Aug 2006) New Revision: 832 Added: trunk/t/73_toggle_moderation.t Modified: trunk/MANIFEST trunk/t/71_missing_metadata.t Log: Add test for setting node moderation flag Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2006-08-10 14:29:14 UTC (rev 831) +++ trunk/MANIFEST 2006-08-10 15:02:47 UTC (rev 832) @@ -104,5 +104,6 @@ t/68_bug_website_displayed.t t/70_admin_home.t t/71_missing_metadata.t +t/73_toggle_moderation.t t/templates/15_test.tt wiki.cgi Modified: trunk/t/71_missing_metadata.t =================================================================== --- trunk/t/71_missing_metadata.t 2006-08-10 14:29:14 UTC (rev 831) +++ trunk/t/71_missing_metadata.t 2006-08-10 15:02:47 UTC (rev 832) @@ -8,7 +8,7 @@ my $have_sqlite = $@ ? 0 : 1; SKIP: { - skip "DBD::SQLite not installed - no database to test with", 17 + skip "DBD::SQLite not installed - no database to test with", 26 unless $have_sqlite; Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); Added: trunk/t/73_toggle_moderation.t =================================================================== --- trunk/t/73_toggle_moderation.t 2006-08-10 14:29:14 UTC (rev 831) +++ trunk/t/73_toggle_moderation.t 2006-08-10 15:02:47 UTC (rev 832) @@ -0,0 +1,114 @@ +use strict; +use Wiki::Toolkit::Setup::SQLite; +use OpenGuides; +use OpenGuides::Test; +use Test::More tests => 12; + +eval { require DBD::SQLite; }; +my $have_sqlite = $@ ? 0 : 1; + +SKIP: { + skip "DBD::SQLite not installed - no database to test with", 12 + unless $have_sqlite; + + Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); + my $config = OpenGuides::Test->make_basic_config; + $config->script_name( "wiki.cgi" ); + $config->script_url( "http://example.com/" ); + my $guide = OpenGuides->new( config => $config ); + isa_ok( $guide, "OpenGuides" ); + my $wiki = $guide->wiki; + isa_ok( $wiki, "Wiki::Toolkit" ); + + # Clear out the database from any previous runs. + foreach my $del_node ( $wiki->list_all_nodes ) { + print "# Deleting node $del_node\n"; + $wiki->delete_node( $del_node ) or die "Can't delete $del_node"; + } + + + # Add 3 different pages, one of which with two versions + $wiki->write_node( "Test Page", "foo", undef, + { category => "Alpha", lat=>"" } ) + or die "Couldn't write node"; + $wiki->write_node( "Test Page 2", "foo2", undef, + { category => "Alpha", lat=>"22.22" } ) + or die "Couldn't write node"; + $wiki->write_node( "Test Page 3", "foo33", undef, + { category => "Alpha" } ) + or die "Couldn't write node"; + $wiki->write_node( "Category Foo", "foo", undef, + { category => "Categories", lat=>"-8.77" } ) + or die "Couldn't write category"; + $wiki->write_node( "Locale Bar", "foo", undef, + { category => "Locales", lat=>"8.22" } ) + or die "Couldn't write locale"; + my %data = $wiki->retrieve_node( "Locale Bar" ); + $wiki->write_node( "Locale Bar", "foo version 2", $data{checksum}, + { category => "Locales", lat=>"8.88" } ) + or die "Couldn't write locale for the 2nd time"; + + + # First up, try with no password + my $output = $guide->set_node_moderation( + id => "Test Page 3", + moderation_flag => 0, + return_output => 1 + ); + like($output, qr|Change moderation status|, "Confirm page"); + like($output, qr|Confirm Moderation|, "Confirm page"); + + + # Now, try with the wrong password + $output = $guide->set_node_moderation( + id => "Test Page 3", + moderation_flag => 0, + password => "I_AM_WRONG", + return_output => 1 + ); + like($output, qr|Incorrect Password|, "Wrong password"); + like($output, qr|Incorrect password for page moderation|, "Wrong password"); + + + # Check that "Test Page 3" doesn't have moderation set + my %node = $wiki->retrieve_node("Test Page 3"); + is($node{'node_requires_moderation'}, 0, "Doesn't have moderation on by default"); + + # Set the moderation flag on it to off + $guide->set_node_moderation( + id => "Test Page 3", + moderation_flag => 0, + password => $guide->config->admin_pass + ); + %node = $wiki->retrieve_node("Test Page 3"); + is($node{'node_requires_moderation'}, 0, "Doesn't have moderation set when called with 0"); + + # Set it to on + $guide->set_node_moderation( + id => "Test Page 3", + moderation_flag => 1, + password => $guide->config->admin_pass + ); + %node = $wiki->retrieve_node("Test Page 3"); + is($node{'node_requires_moderation'}, 1, "Turned on properly"); + + # Set it back to off + $guide->set_node_moderation( + id => "Test Page 3", + moderation_flag => 0, + password => $guide->config->admin_pass + ); + %node = $wiki->retrieve_node("Test Page 3"); + is($node{'node_requires_moderation'}, 0, "Turned off properly"); + + + # Test we were sent to the right place + $output = $guide->set_node_moderation( + id => "Test Page 3", + moderation_flag => 0, + password => $guide->config->admin_pass, + return_output => 1 + ); + like($output, qr|Location: http://example.com/wiki.cgi\?action=admin&moderation=changed|, "Right location"); + like($output, qr|Status: 302 Moved|, "Right status"); +}

1 0

r831 - in trunk: . lib templates
by svnadmin＠urchin.earth.li 10 Aug '06

10 Aug '06

Author: nick Date: 2006-08-10 15:29:14 +0100 (Thu, 10 Aug 2006) New Revision: 831 Modified: trunk/lib/OpenGuides.pm trunk/templates/admin_home.tt trunk/templates/needing_moderation.tt trunk/templates/node.tt trunk/wiki.cgi Log: Tweak display of un-moderated pages, and listings of them Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-08-03 16:42:58 UTC (rev 830) +++ trunk/lib/OpenGuides.pm 2006-08-10 14:29:14 UTC (rev 831) @@ -173,6 +173,7 @@ my $raw = $node_data{content} || " "; my $content = $wiki->format($raw); my $modified = $node_data{last_modified}; + my $moderated = $node_data{moderated}; my %metadata = %{$node_data{metadata}}; my ($wgs84_long, $wgs84_lat) = OpenGuides::Utils->get_wgs84_coords( @@ -199,6 +200,7 @@ version => $node_data{version}, node => $id, language => $config->default_language, + moderated => $moderated, oldid => $oldid, enable_gmaps => 1, display_google_maps => $self->get_cookie("display_google_maps"), Modified: trunk/templates/admin_home.tt =================================================================== --- trunk/templates/admin_home.tt 2006-08-03 16:42:58 UTC (rev 830) +++ trunk/templates/admin_home.tt 2006-08-10 14:29:14 UTC (rev 831) @@ -19,7 +19,7 @@ <tr> <td><a href="[% node.view_url %]">[% node.name %]</a></td> <td>[% node.version %]</td> - <td>[% node.moderate %]</td> + <td>[% IF node.moderate %]yes[% ELSE %]no[% END %]</td> <td><a href="[% node.view_url %]">View</a> or <a href="[% node.versions_url %]">View all versions</a> or <a href="[% node.moderation_url %]">Set Moderation</a> Modified: trunk/templates/needing_moderation.tt =================================================================== --- trunk/templates/needing_moderation.tt 2006-08-03 16:42:58 UTC (rev 830) +++ trunk/templates/needing_moderation.tt 2006-08-10 14:29:14 UTC (rev 831) @@ -7,14 +7,15 @@ <p> These are nodes which have been created/edited, but not yet moderated. </p> -<table id="wanted_pages" style="width:80%"> +<table id="needing_moderation" style="width:90%"> <tr><th>Node name</th><th>Pending Version</th><th>Latest Moderated Version</th><th>Action</th></tr> [% FOREACH node = nodes %] <tr> <td>[% node.name %]</td> - <td>[% node.version %]</td> - <td>[% node.moderated_version %]</td> + <td align="center">[% node.version %]</td> + <td align="center">[% node.moderated_version %]</td> <td><a href="[% node.moderate_url %]">Moderate this version</a> + or <a href="[% node.view_url %]">View this version</a> or <a href="[% node.diff_url %]">See changes</a> </td> </tr> Modified: trunk/templates/node.tt =================================================================== --- trunk/templates/node.tt 2006-08-03 16:42:58 UTC (rev 830) +++ trunk/templates/node.tt 2006-08-10 14:29:14 UTC (rev 831) @@ -34,8 +34,13 @@ <h2 class="node_name">[% node_name %]</h2> [% END %] [% ELSE %] - <h2> - <em>Historical version [% version %] of + <h2><em> + [% IF moderated %] + Historical + [% ELSE %] + Un-moderated + [% END %] + version [% version %] of <span class="node_name">[% node_name %]</span></em> </h2> [% END %] Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2006-08-03 16:42:58 UTC (rev 830) +++ trunk/wiki.cgi 2006-08-10 14:29:14 UTC (rev 831) @@ -392,11 +392,12 @@ sub show_needing_moderation { my @nodes = $wiki->list_unmoderated_nodes; - # Build the moderate link + # Build the moderate links foreach my $node (@nodes) { my $node_param = uri_escape($formatter->node_name_to_node_param($node->{'name'})); $node->{'moderate_url'} = $script_url . "?action=moderate&id=".$node_param."&version=".$node->{'version'}; + $node->{'view_url'} = $script_url . "?id=".$node_param."&version=".$node->{'version'}; $node->{'diff_url'} = $script_url . "?id=".$node_param."&version=".$node->{'moderated_version'}."&diffversion=".$node->{'version'}; }

1 0

r830 - trunk/lib
by svnadmin＠urchin.earth.li 03 Aug '06

03 Aug '06

Author: nick Date: 2006-08-03 17:42:58 +0100 (Thu, 03 Aug 2006) New Revision: 830 Modified: trunk/lib/OpenGuides.pm Log: Add a note about how we shouldn't auto-generate categories and locales on moderation required nodes, until after moderation has happened Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-08-03 16:39:13 UTC (rev 829) +++ trunk/lib/OpenGuides.pm 2006-08-03 16:42:58 UTC (rev 830) @@ -986,6 +986,8 @@ if $metadata{longitude_unmunged}; # Check to make sure all the indexable nodes are created + # TODO: Split this off into another function + # TODO: Don't run this if the node requires moderation (only do it after someone moderates) foreach my $type (qw(Category Locale)) { my $lctype = lc($type); foreach my $index (@{$metadata{$lctype}}) {

1 0

r829 - in trunk: . lib templates
by svnadmin＠urchin.earth.li 03 Aug '06

03 Aug '06

Author: nick Date: 2006-08-03 17:39:13 +0100 (Thu, 03 Aug 2006) New Revision: 829 Added: trunk/templates/moderate_confirm.tt trunk/templates/moderate_password_wrong.tt Modified: trunk/MANIFEST trunk/lib/OpenGuides.pm trunk/wiki.cgi Log: Support for toggling moderation on and off on nodes Modified: trunk/MANIFEST =================================================================== --- trunk/MANIFEST 2006-08-03 15:08:05 UTC (rev 828) +++ trunk/MANIFEST 2006-08-03 16:39:13 UTC (rev 829) @@ -43,6 +43,8 @@ templates/home_node.tt templates/map_index.tt templates/missing_metadata.tt +templates/moderate_confirm.tt +templates/moderate_password_wrong.tt templates/navbar.tt templates/needing_moderation.tt templates/newpage.tt Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2006-08-03 15:08:05 UTC (rev 828) +++ trunk/lib/OpenGuides.pm 2006-08-03 16:39:13 UTC (rev 829) @@ -1132,6 +1132,81 @@ } } +=item B<set_node_moderation> + + $guide->set_node_moderation( + id => "FAQ", + password => "beer", + moderation_flag => 1, + ); + +Sets the moderation needed flag on a node, either on or off. + +If C<password> is not supplied then a form for entering the password +will be displayed. +=cut +sub set_node_moderation { + my ($self, %args) = @_; + my $node = $args{id} or croak "No node ID supplied for node moderation"; + my $return_tt_vars = $args{return_tt_vars} || 0; + my $return_output = $args{return_output} || 0; + + # Get the moderation flag into something sane + if($args{moderation_flag} eq "1" || $args{moderation_flag} eq "yes" || + $args{moderation_flag} eq "on" || $args{moderation_flag} eq "true") { + $args{moderation_flag} = 1; + } else { + $args{moderation_flag} = 0; + } + + # Set up the TT variables + my %tt_vars = ( + not_editable => 1, + not_deletable => 1, + deter_robots => 1, + moderation_action => 'set_moderation', + moderation_flag => $args{moderation_flag}, + moderation_url_args => 'action=set_moderation;moderation_flag='.$args{moderation_flag}, + ); + + my $password = $args{password}; + + if ($password) { + if ($password ne $self->config->admin_pass) { + return %tt_vars if $return_tt_vars; + my $output = $self->process_template( + id => $node, + template => "moderate_password_wrong.tt", + tt_vars => \%tt_vars, + ); + return $output if $return_output; + print $output; + } else { + $self->wiki->set_node_moderation( + name => $node, + required => $args{moderation_flag}, + ); + + # Send back to the admin interface + my $script_url = $self->config->script_url; + my $script_name = $self->config->script_name; + my $q = CGI->new; + my $output = $q->redirect( $script_url.$script_name."?action=admin&moderation=changed" ); + return $output if $return_output; + print $output; + } + } else { + return %tt_vars if $return_tt_vars; + my $output = $self->process_template( + id => $node, + template => "moderate_confirm.tt", + tt_vars => \%tt_vars, + ); + return $output if $return_output; + print $output; + } +} + =item B<show_missing_metadata> Search for nodes which don't have a certain kind of metadata. Optionally also excludes Locales and Categories Added: trunk/templates/moderate_confirm.tt =================================================================== --- trunk/templates/moderate_confirm.tt 2006-08-03 15:08:05 UTC (rev 828) +++ trunk/templates/moderate_confirm.tt 2006-08-03 16:39:13 UTC (rev 829) @@ -0,0 +1,40 @@ +[% IF moderation_action == 'set_moderation' %] + [% INCLUDE header.tt page_title = "Change moderation status of $node_name" %] +[% ELSE %] + [% INCLUDE header.tt page_title = "Moderate a version of $node_name" %] +[% END %] +[% INCLUDE banner.tt %] +<div id="content"> +[% INCLUDE navbar.tt %] +<div id="maincontent"> + +<h1>Confirm Moderation</h1> +<p> +[% IF moderation_action == 'set_moderation' %] + You are about to change the moderation flag on + <span class="node_name">[% node_name %]</span>. +[% ELSE %] + You are about to moderate a version of + <span class="node_name">[% node_name %]</span>. + completely erase this page and all its history. +[% END %] +To do so, please enter the admin password. If not, you can +<a href="[% cgi_url %]?action=admin">go back to the admin page</a>. +</p> +<form action="[% cgi_url %]" method="post"> + <input type="hidden" name="action" value="[% moderation_action %]" /> + <input type="hidden" name="id" value="[% node_param %]" /> +[% IF moderation_action == 'set_moderation' %] + <label for="moderation_flag">Moderation Required:</label> + <input type="checkbox" name="moderation_flag" [% IF moderation_flag %]checked="yes"[% END %] /> + <br /> +[% ELSE %] + <input type="hidden" name="version" value="[% version %]" /> +[% END %] + <strong>Password:</strong> + <input type="password" name="password" /> + <input type="submit" value="Action Moderation" /> +</form> + +</div> +[% INCLUDE footer.tt %] Added: trunk/templates/moderate_password_wrong.tt =================================================================== --- trunk/templates/moderate_password_wrong.tt 2006-08-03 15:08:05 UTC (rev 828) +++ trunk/templates/moderate_password_wrong.tt 2006-08-03 16:39:13 UTC (rev 829) @@ -0,0 +1,12 @@ +[% INCLUDE header.tt page_title = "Incorrect password for page moderation - $site_name" %] +[% INCLUDE banner.tt %] +<div id="content"> +[% INCLUDE navbar.tt %] +<div id="maincontent"> +<h1>Incorrect Password</h1> +<p> +Sorry, that was not the correct password. Please +<a href="[% cgi_url %]?id=[% node_param %];[% moderation_url_args %]">try again</a>. +</p> +</div> +[% INCLUDE footer.tt %] Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2006-08-03 15:08:05 UTC (rev 828) +++ trunk/wiki.cgi 2006-08-03 16:39:13 UTC (rev 829) @@ -95,7 +95,7 @@ $guide->set_node_moderation( id => $node, password => $q->param("password") || "", - moderation_flag => $q->param("moderation_flat") || "", + moderation_flag => $q->param("moderation_flag") || "", ); } elsif ( $action eq 'moderate' ) { $guide->moderate_node(

1 0

r828 - trunk
by svnadmin＠urchin.earth.li 03 Aug '06

03 Aug '06

Author: nick Date: 2006-08-03 16:08:05 +0100 (Thu, 03 Aug 2006) New Revision: 828 Modified: trunk/Changes Log: Write about recent updates Modified: trunk/Changes =================================================================== --- trunk/Changes 2006-08-03 15:05:29 UTC (rev 827) +++ trunk/Changes 2006-08-03 15:08:05 UTC (rev 828) @@ -1,4 +1,8 @@ "#" items refer to tickets. See <http://dev.openguides.org/report/9> for details. +0.57 ?? August 2006 + Lots more Atom and RSS feeds, including for searching + Admin interface + Nodes missing metadata interface 0.56 14 June 2006 Fix bug introduced in feed formatting where Atom feeds would be

1 0

r827 - trunk/templates
by svnadmin＠urchin.earth.li 03 Aug '06

03 Aug '06

Author: nick Date: 2006-08-03 16:05:29 +0100 (Thu, 03 Aug 2006) New Revision: 827 Modified: trunk/templates/missing_metadata.tt Log: Tweak Layout Modified: trunk/templates/missing_metadata.tt =================================================================== --- trunk/templates/missing_metadata.tt 2006-08-03 14:39:29 UTC (rev 826) +++ trunk/templates/missing_metadata.tt 2006-08-03 15:05:29 UTC (rev 827) @@ -32,7 +32,7 @@ <div> <label for="metadata_value">Metadata Value:</label> <input name="metadata_value" value="[% metadata_value %]" /> - <br /> +       <i>Optional, eg 'pub' when metadata value is Category</i> </div> <div>

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits August 2006