openguides-commits

openguides-commits@lists.openguides.org

873 discussions

r1064 - in trunk: lib t
by svnadmin＠urchin.earth.li 11 Jun '07

11 Jun '07

Author: kake Date: 2007-06-11 03:23:11 +0100 (Mon, 11 Jun 2007) New Revision: 1064 Modified: trunk/lib/OpenGuides.pm trunk/t/51_display_node.t trunk/t/54_redirect.t Log: Add intercept_redirect parameter to Openguides->display_node - used with the return_output parameter for testing. Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2007-06-10 17:31:17 UTC (rev 1063) +++ trunk/lib/OpenGuides.pm 2007-06-11 02:23:11 UTC (rev 1064) @@ -163,13 +163,25 @@ return_tt_vars => 1, ); -If C<version> is omitted then the latest version will be displayed. +If C<version> is omitted then it will assume you want the latest version. +Note that if you pass the C<return_output> parameter, and your node is a +redirecting node, this method will fake the redirect and return the output +that will actually end up in the user's browser. If instead you want to see +the HTTP headers that will be printed in order to perform the redirect, pass +the C<intercept_redirect> parameter as well. The C<intercept_redirect> +parameter has no effect if the node isn't a redirect, or if the +C<return_output> parameter is omitted. + +(At the moment, C<return_tt_vars> acts as if the C<intercept_redirect> +parameter was passed.) + =cut sub display_node { my ($self, %args) = @_; my $return_output = $args{return_output} || 0; + my $intercept_redirect = $args{intercept_redirect}; my $version = $args{version}; my $id = $args{id} || $self->config->home_name; my $wiki = $self->wiki; @@ -276,9 +288,17 @@ print $output; } elsif ( $wiki->node_exists($redirect) && $redirect ne $id && $redirect ne $oldid ) { # Avoid loops by not generating redirects to the same node or the previous node. - my $output = $self->redirect_to_node($redirect, $id); - return $output if $return_output; - print $output; + if ( $return_output ) { + if ( $intercept_redirect ) { + return $self->redirect_to_node( $redirect, $id ); + } else { + return $self->display_node( id => $redirect, + oldid => $id, + return_output => 1, + ); + } + } + print $self->redirect_to_node( $redirect, $id ); return 0; } } Modified: trunk/t/51_display_node.t =================================================================== --- trunk/t/51_display_node.t 2007-06-10 17:31:17 UTC (rev 1063) +++ trunk/t/51_display_node.t 2007-06-11 02:23:11 UTC (rev 1064) @@ -50,7 +50,9 @@ $wiki->write_node( 'Redirect Test', '#REDIRECT Test Page', undef ); -$output = $guide->display_node( id => 'Redirect Test', return_output => 1 ); +$output = $guide->display_node( id => 'Redirect Test', + return_output => 1, + intercept_redirect => 1 ); like( $output, qr{^\QLocation: http://example.com/wiki.cgi?id=Test_Page;oldid=Redirect_Test}ms, '#REDIRECT redirects correctly' ); Modified: trunk/t/54_redirect.t =================================================================== --- trunk/t/54_redirect.t 2007-06-10 17:31:17 UTC (rev 1063) +++ trunk/t/54_redirect.t 2007-06-11 02:23:11 UTC (rev 1064) @@ -41,7 +41,9 @@ $wiki->write_node( "Test Page 2", "foo" ) or die "Can't write node"; my $output = eval { - $guide->display_node( id => "Test Page", return_output => 1 ); + $guide->display_node( id => "Test Page", + return_output => 1, + intercept_redirect => 1 ); }; is( $@, "", "->display_node doesn't die when page is a redirect" );

1 0

r1063 - in trunk: lib/OpenGuides t
by svnadmin＠urchin.earth.li 10 Jun '07

10 Jun '07

Author: ilmari Date: 2007-06-10 18:31:17 +0100 (Sun, 10 Jun 2007) New Revision: 1063 Modified: trunk/lib/OpenGuides/Test.pm trunk/t/21_rdf.t Log: Convert t/21_rdf.t to use OpenGuides::Test->write_data and extend this as needed Modified: trunk/lib/OpenGuides/Test.pm =================================================================== --- trunk/lib/OpenGuides/Test.pm 2007-06-10 17:13:36 UTC (rev 1062) +++ trunk/lib/OpenGuides/Test.pm 2007-06-10 17:31:17 UTC (rev 1063) @@ -165,12 +165,14 @@ my $q = OpenGuides::Test->make_cgi_object; -You can supply values for the following keys: C<content>, -C<categories>, C<locales>, C<os_x>, C<os_y>, C<osie_x>, C<osie_y>, -C<latitude>, C<longitude>, C<summary>, C<node_image>, C<node_image_licence>, -C<node_image_copyright>, C<node_image_url>, C<username>, C<comment>, -C<edit_type>. You should supply them exactly as they would come from a CGI -form, eg lines in a textarea are separated by C<\r\n>. +You can supply values for the following keys: C<content>, C<categories>, +C<locales>, C<node_image>, C<node_image_licence>, +C<node_image_copyright>, C<node_image_url>, C<phone>, C<fax>, +C<website>, C<hours_text>, C<address>, C<postcode>, C<map_link>, +C<os_x>, C<os_y>, C<osie_x>, C<osie_y>, C<latitude>, C<longitude>, +C<summary>, C<username>, C<comment>, C<edit_type>. You should supply +them exactly as they would come from a CGI form, eg lines in a textarea +are separated by C<\r\n>. =cut @@ -180,34 +182,16 @@ # Set up CGI parameters ready for a node write. # Most of these are in here to avoid uninitialised value warnings. my $q = CGI->new( "" ); - $q->param( -name => "content", -value => $args{content} || "foo" ); - $q->param( -name => "categories", -value => $args{categories} || "" ); - $q->param( -name => "locales", -value => $args{locales} || "" ); - $q->param( -name => "node_image", -value => $args{node_image} || "" ); - $q->param( -name => "node_image_licence", - -value => $args{node_image_licence} || "" ); - $q->param( -name => "node_image_copyright", - -value => $args{node_image_copyright} || "" ); - $q->param( -name => "node_image_url", - -value => $args{node_image_url} || "" ); - $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 => $args{os_x} || "" ); - $q->param( -name => "os_y", -value => $args{os_y} || "" ); - $q->param( -name => "osie_x", -value => $args{osie_x} || "" ); - $q->param( -name => "osie_y", -value => $args{osie_y} || "" ); - $q->param( -name => "latitude", -value => $args{latitude} || "" ); - $q->param( -name => "longitude", -value => $args{longitude} || "" ); - $q->param( -name => "summary", -value => $args{summary} || "" ); - $q->param( -name => "username", -value => $args{username} || "TestUser" ); - $q->param( -name => "comment", -value => $args{comment} || "A comment." ); - $q->param( -name => "edit_type", - -value => $args{edit_type} || "Normal edit" ); + $args{content} ||= "foo"; + $args{edit_type} ||= "Normal edit"; + for my $param ( qw( content categories locales node_image node_image_licence + node_image_copyright node_image_url phone fax website + hours_text address postcode map_link os_x os_y osie_x osie_y + latitude longitude summary username comment edit_type + ) + ) { + $q->param( -name => $param, -value => $args{$param} || "" ); + } $ENV{REMOTE_ADDR} = "127.0.0.1"; return $q; Modified: trunk/t/21_rdf.t =================================================================== --- trunk/t/21_rdf.t 2007-06-10 17:13:36 UTC (rev 1062) +++ trunk/t/21_rdf.t 2007-06-10 17:31:17 UTC (rev 1063) @@ -29,7 +29,8 @@ if ( $@ ) { $config->use_plucene ( 0 ) }; -my $wiki = OpenGuides::Utils->make_wiki_object( config => $config ); +my $guide = OpenGuides->new( config => $config ); +my $wiki = $guide->wiki; # Clear out the database from any previous runs. foreach my $del_node ( $wiki->list_all_nodes ) { @@ -43,21 +44,20 @@ isa_ok( $rdf_writer, "OpenGuides::RDF" ); # Test the data for a node that exists. -$wiki->write_node( "Calthorpe Arms", - "CAMRA-approved pub near King's Cross", - undef, - { +OpenGuides::Test->write_data( + guide => $guide, + node => "Calthorpe Arms", + content => "CAMRA-approved pub near King's Cross", comment => "Stub page, please update!", username => "Kake", postcode => "WC1X 8JR", - locale => [ "Bloomsbury", "St Pancras" ], + locales => "Bloomsbury\r\nSt Pancras", phone => "test phone number", website => "test website", - opening_hours_text => "test hours", + hours_text => "test hours", latitude => "51.524193", longitude => "-0.114436", summary => "a nice pub", - } ); my $rdfxml = $rdf_writer->emit_rdfxml( node => "Calthorpe Arms" ); @@ -105,7 +105,7 @@ $config = OpenGuides::Test->make_basic_config; $config->default_city( "" ); $config->default_country( "" ); -my $guide = OpenGuides->new( config => $config ); +$guide = OpenGuides->new( config => $config ); OpenGuides::Test->write_data( guide => $guide, node => "Star Tavern",

1 0

r1062 - trunk/t
by svnadmin＠urchin.earth.li 10 Jun '07

10 Jun '07

Author: kake Date: 2007-06-10 18:13:36 +0100 (Sun, 10 Jun 2007) New Revision: 1062 Modified: trunk/t/70_admin_home.t Log: Apply Andrew's patch, fixes #212 (uninitialised value warnings in test 70). Incidental change: use OpenGuides::Test->write_data instead of Wiki::Toolkit->write_node, hence change in number at line 59, since OpenGuides::Test autocreates categories and locales and Wiki::Toolkit doesn't. Modified: trunk/t/70_admin_home.t =================================================================== --- trunk/t/70_admin_home.t 2007-06-10 16:29:52 UTC (rev 1061) +++ trunk/t/70_admin_home.t 2007-06-10 17:13:36 UTC (rev 1062) @@ -29,19 +29,26 @@ # Add 3 different pages, one of which with two versions -$wiki->write_node( "Test Page", "foo", undef, - { category => "Alpha" } ) - or die "Couldn't write node"; -$wiki->write_node( "Test Page 2", "foo", undef, - { category => "Alpha" } ) - or die "Couldn't write node"; -$wiki->write_node( "Locale Bar", "foo", undef, - { category => "Locales" } ) - 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" } ) - or die "Couldn't write locale for the 2nd time"; +OpenGuides::Test->write_data( + guide => $guide, + node => "Test Page", + categories => "Alpha", + return_output => 1 ); +OpenGuides::Test->write_data( + guide => $guide, + node => "Test Page 2", + categories => "Alpha", + return_output => 1 ); +OpenGuides::Test->write_data( + guide => $guide, + node => "Locale Bar", + categories => "Locales", + return_output => 1 ); +OpenGuides::Test->write_data( + guide => $guide, + node => "Locale Bar", + categories => "Locales", + return_output => 1 ); # Test the tt vars @@ -52,7 +59,7 @@ is( scalar @{$ttvars{'nodes'}}, 2, "Right number of nodes" ); is( scalar @{$ttvars{'locales'}}, 1, "Right number of locales" ); -is( scalar @{$ttvars{'categories'}}, 0, "Right number of categories" ); +is( scalar @{$ttvars{'categories'}}, 2, "Right number of categories" ); my @node_names = map { $_->{name}; } @{$ttvars{nodes}}; is_deeply( [ sort @node_names ], [ "Test Page", "Test Page 2" ], @@ -67,4 +74,4 @@ like( $output, qr|Site Administration|, "Right page" ); like( $output, qr|Test Page|, "Has nodes" ); -like( $output, qr|Bar|, "Has locales" ); \ No newline at end of file +like( $output, qr|Bar|, "Has locales" );

1 0

r1061 - trunk/templates
by svnadmin＠urchin.earth.li 10 Jun '07

10 Jun '07

Author: ilmari Date: 2007-06-10 17:29:52 +0100 (Sun, 10 Jun 2007) New Revision: 1061 Modified: trunk/templates/node_rdf.tt Log: Fix OS namespace URI. Modified: trunk/templates/node_rdf.tt =================================================================== --- trunk/templates/node_rdf.tt 2007-06-10 16:02:07 UTC (rev 1060) +++ trunk/templates/node_rdf.tt 2007-06-10 16:29:52 UTC (rev 1061) @@ -8,7 +8,7 @@ xmlns:chefmoz="http://chefmoz.org/rdf/elements/1.0/" xmlns:wn="http://xmlns.com/wordnet/1.6/" xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#" - xmlns:os="http://downlode.org/rdf/os/0.1/" + xmlns:os="http://downlode.org/Code/RDF/Ordnance_Survey/schema/1#" xmlns:owl="http://www.w3.org/2002/07/owl#" xmlns="http://www.w3.org/2000/10/swap/pim/contact#" >

1 0

r1060 - in trunk: . lib/OpenGuides t templates
by svnadmin＠urchin.earth.li 10 Jun '07

10 Jun '07

Author: ilmari Date: 2007-06-10 17:02:07 +0100 (Sun, 10 Jun 2007) New Revision: 1060 Modified: trunk/Changes trunk/lib/OpenGuides/RDF.pm trunk/t/21_rdf.t trunk/templates/node_rdf.tt Log: Revert broken commit (there is no <os:map_link> tag) Modified: trunk/Changes =================================================================== --- trunk/Changes 2007-06-10 15:31:06 UTC (rev 1059) +++ trunk/Changes 2007-06-10 16:02:07 UTC (rev 1060) @@ -16,7 +16,6 @@ Respect redirect=0 (#104). If an unknown action is supplied to wiki.cgi, redirect to action=display (partial fix for #102) - Include <os:map_link> in node RDF (fixes #26). 0.60 13 May 2007 Removed footer search from edit page (shouldn't have been there). Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2007-06-10 15:31:06 UTC (rev 1059) +++ trunk/lib/OpenGuides/RDF.pm 2007-06-10 16:02:07 UTC (rev 1060) @@ -81,7 +81,7 @@ foreach my $var ( qw( phone fax website opening_hours_text address postcode city country latitude longitude username - os_x os_y summary map_link ) ) { + os_x os_y summary ) ) { my $val = $metadata{$var}[0] || $defaults{$var} || ""; $tt_vars{$var} = $val; } @@ -103,7 +103,7 @@ # Check for geospatialness and define container object as appropriate. my $is_geospatial; foreach my $var ( qw( os_x os_y latitude longitude address postcode - opening_hours_text map_link ) ) { + opening_hours_text ) ) { $is_geospatial = 1 if $tt_vars{$var}; } Modified: trunk/t/21_rdf.t =================================================================== --- trunk/t/21_rdf.t 2007-06-10 15:31:06 UTC (rev 1059) +++ trunk/t/21_rdf.t 2007-06-10 16:02:07 UTC (rev 1060) @@ -15,7 +15,7 @@ plan skip_all => "DBD::SQLite could not be used - no database to test with. ($error)"; } -plan tests => 28; +plan tests => 27; Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; @@ -56,7 +56,6 @@ opening_hours_text => "test hours", latitude => "51.524193", longitude => "-0.114436", - map_link => "http://pubsite.com/calthorpe/get_there.htm", summary => "a nice pub", } ); @@ -82,10 +81,6 @@ qr|<dc:title>Wiki::Toolkit Test Site: Calthorpe Arms</dc:title>|, "sets the title correctly" ); -like( $rdfxml, - qr|<os:map_link rdf:resource="http://pubsite.com/calthorpe/get_there.htm" />|, - "includes map link" ); - like( $rdfxml, qr|<foaf:Person rdf:ID="Kake">|, "last username to edit used as contributor" ); Modified: trunk/templates/node_rdf.tt =================================================================== --- trunk/templates/node_rdf.tt 2007-06-10 15:31:06 UTC (rev 1059) +++ trunk/templates/node_rdf.tt 2007-06-10 16:02:07 UTC (rev 1060) @@ -77,10 +77,6 @@ <os:y>[% os_y %]</os:y> [% END %] - [% IF map_link %] - <os:map_link rdf:resource="[% map_link %]" /> - [% END %] - [% END %] [% IF phone OR fax OR website OR opening_hours_text %]

1 0

r1059 - in trunk: . lib/OpenGuides t templates
by svnadmin＠urchin.earth.li 10 Jun '07

10 Jun '07

Author: ilmari Date: 2007-06-10 16:31:06 +0100 (Sun, 10 Jun 2007) New Revision: 1059 Modified: trunk/Changes trunk/lib/OpenGuides/RDF.pm trunk/t/21_rdf.t trunk/templates/node_rdf.tt Log: Include <os:map_link> in node RDF (fixes #26) Modified: trunk/Changes =================================================================== --- trunk/Changes 2007-06-10 15:29:55 UTC (rev 1058) +++ trunk/Changes 2007-06-10 15:31:06 UTC (rev 1059) @@ -16,6 +16,7 @@ Respect redirect=0 (#104). If an unknown action is supplied to wiki.cgi, redirect to action=display (partial fix for #102) + Include <os:map_link> in node RDF (fixes #26). 0.60 13 May 2007 Removed footer search from edit page (shouldn't have been there). Modified: trunk/lib/OpenGuides/RDF.pm =================================================================== --- trunk/lib/OpenGuides/RDF.pm 2007-06-10 15:29:55 UTC (rev 1058) +++ trunk/lib/OpenGuides/RDF.pm 2007-06-10 15:31:06 UTC (rev 1059) @@ -81,7 +81,7 @@ foreach my $var ( qw( phone fax website opening_hours_text address postcode city country latitude longitude username - os_x os_y summary ) ) { + os_x os_y summary map_link ) ) { my $val = $metadata{$var}[0] || $defaults{$var} || ""; $tt_vars{$var} = $val; } @@ -103,7 +103,7 @@ # Check for geospatialness and define container object as appropriate. my $is_geospatial; foreach my $var ( qw( os_x os_y latitude longitude address postcode - opening_hours_text ) ) { + opening_hours_text map_link ) ) { $is_geospatial = 1 if $tt_vars{$var}; } Modified: trunk/t/21_rdf.t =================================================================== --- trunk/t/21_rdf.t 2007-06-10 15:29:55 UTC (rev 1058) +++ trunk/t/21_rdf.t 2007-06-10 15:31:06 UTC (rev 1059) @@ -15,7 +15,7 @@ plan skip_all => "DBD::SQLite could not be used - no database to test with. ($error)"; } -plan tests => 27; +plan tests => 28; Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Test->make_basic_config; @@ -56,6 +56,7 @@ opening_hours_text => "test hours", latitude => "51.524193", longitude => "-0.114436", + map_link => "http://pubsite.com/calthorpe/get_there.htm", summary => "a nice pub", } ); @@ -81,6 +82,10 @@ qr|<dc:title>Wiki::Toolkit Test Site: Calthorpe Arms</dc:title>|, "sets the title correctly" ); +like( $rdfxml, + qr|<os:map_link rdf:resource="http://pubsite.com/calthorpe/get_there.htm" />|, + "includes map link" ); + like( $rdfxml, qr|<foaf:Person rdf:ID="Kake">|, "last username to edit used as contributor" ); Modified: trunk/templates/node_rdf.tt =================================================================== --- trunk/templates/node_rdf.tt 2007-06-10 15:29:55 UTC (rev 1058) +++ trunk/templates/node_rdf.tt 2007-06-10 15:31:06 UTC (rev 1059) @@ -77,6 +77,10 @@ <os:y>[% os_y %]</os:y> [% END %] + [% IF map_link %] + <os:map_link rdf:resource="[% map_link %]" /> + [% END %] + [% END %] [% IF phone OR fax OR website OR opening_hours_text %]

1 0

r1058 - trunk
by svnadmin＠urchin.earth.li 10 Jun '07

10 Jun '07

Author: dom Date: 2007-06-10 16:29:55 +0100 (Sun, 10 Jun 2007) New Revision: 1058 Modified: trunk/Build.PL Log: Clarify error message with missing build deps (patch from andrewb) (fixes #211) Modified: trunk/Build.PL =================================================================== --- trunk/Build.PL 2007-06-10 15:21:02 UTC (rev 1057) +++ trunk/Build.PL 2007-06-10 15:29:55 UTC (rev 1058) @@ -9,7 +9,7 @@ require OpenGuides::Config; }; -die "Config::Tiny is required to configure this application.\n" if $@; +die "Problem loading OpenGuides module or a missing module\n\n$@.\n" if $@; print <<EOF;

1 0

r1057 - trunk
by svnadmin＠urchin.earth.li 10 Jun '07

10 Jun '07

Author: dom Date: 2007-06-10 16:21:02 +0100 (Sun, 10 Jun 2007) New Revision: 1057 Modified: trunk/Changes trunk/wiki.cgi Log: If an unknown action is used redirect to action=display, preserving other args (see #102) Modified: trunk/Changes =================================================================== --- trunk/Changes 2007-06-10 14:47:11 UTC (rev 1056) +++ trunk/Changes 2007-06-10 15:21:02 UTC (rev 1057) @@ -14,6 +14,8 @@ Only display the google maps preference if node maps are enabled (#192). Respect redirect=0 (#104). + If an unknown action is supplied to wiki.cgi, redirect to + action=display (partial fix for #102) 0.60 13 May 2007 Removed footer search from edit page (shouldn't have been there). Modified: trunk/wiki.cgi =================================================================== --- trunk/wiki.cgi 2007-06-10 14:47:11 UTC (rev 1056) +++ trunk/wiki.cgi 2007-06-10 15:21:02 UTC (rev 1057) @@ -186,7 +186,7 @@ print $q->redirect( $redir_target ); } elsif ($action eq 'about') { $guide->display_about(format => $format); - } else { # Default is to display a node. + } elsif ($action eq 'display') { if ( $format and $format eq "rdf" ) { display_node_rdf( node => $node ); } elsif ( $format and $format eq 'raw' ) { @@ -220,7 +220,23 @@ ); } } + } else { + # Fallback: redirect to the display page, preserving all vars + # except for the action, which we override. + # Note: $q->Vars needs munging if we need to support any + # multi-valued params + my $params = $q->Vars; + $params->{'action'} = 'display'; + my $redir_target = $script_url . $script_name . '?'; + my @args = map { "$_=" . $params->{$_} } keys %{$params}; + $redir_target .= join ';', @args; + + print $q->redirect( + -uri => $redir_target, + -status => 303 + ); } + }; if ($@) {

1 0

r1056 - in trunk: . lib t
by svnadmin＠urchin.earth.li 10 Jun '07

10 Jun '07

Author: ilmari Date: 2007-06-10 15:47:11 +0100 (Sun, 10 Jun 2007) New Revision: 1056 Modified: trunk/Changes trunk/lib/OpenGuides.pm trunk/t/51_display_node.t Log: Check for definedness of redirect parameter before defaulting to 1 (closes #104). Modified: trunk/Changes =================================================================== --- trunk/Changes 2007-06-10 14:27:19 UTC (rev 1055) +++ trunk/Changes 2007-06-10 14:47:11 UTC (rev 1056) @@ -13,6 +13,7 @@ Support alternative database ports Only display the google maps preference if node maps are enabled (#192). + Respect redirect=0 (#104). 0.60 13 May 2007 Removed footer search from edit page (shouldn't have been there). Modified: trunk/lib/OpenGuides.pm =================================================================== --- trunk/lib/OpenGuides.pm 2007-06-10 14:27:19 UTC (rev 1055) +++ trunk/lib/OpenGuides.pm 2007-06-10 14:47:11 UTC (rev 1056) @@ -175,7 +175,7 @@ my $wiki = $self->wiki; my $config = $self->config; my $oldid = $args{oldid} || ''; - my $do_redirect = $args{redirect} || 1; + my $do_redirect = defined($args{redirect}) ? $args{redirect} : 1; my %tt_vars; Modified: trunk/t/51_display_node.t =================================================================== --- trunk/t/51_display_node.t 2007-06-10 14:27:19 UTC (rev 1055) +++ trunk/t/51_display_node.t 2007-06-10 14:47:11 UTC (rev 1056) @@ -12,7 +12,7 @@ plan skip_all => "DBD::SQLite could not be used - no database to test with ($error)"; } -plan tests => 7; +plan tests => 9; Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } ); my $config = OpenGuides::Config->new( @@ -47,3 +47,14 @@ like( $output, qr{\Q<a href="wiki.cgi?action=edit;id=My_Home_Page"\E>Edit\s+this\s+page</a>}, "...and home page has an edit link" ); my %tt_vars = $guide->display_node( return_tt_vars => 1 ); ok( defined $tt_vars{recent_changes}, "...and recent_changes is set for the home node even if we have changed its name" ); + +$wiki->write_node( 'Redirect Test', '#REDIRECT Test Page', undef ); + +$output = $guide->display_node( id => 'Redirect Test', return_output => 1 ); + +like( $output, qr{^\QLocation: http://example.com/wiki.cgi?id=Test_Page;oldid=Redirect_Test}ms, + '#REDIRECT redirects correctly' ); + +$output = $guide->display_node( id => 'Redirect Test', return_output => 1, redirect => 0 ); + +unlike( $output, qr{^\QLocation: }ms, '...but not with redirect=0' );

1 0

r1055 - trunk/templates
by svnadmin＠urchin.earth.li 10 Jun '07

10 Jun '07

Author: kake Date: 2007-06-10 15:27:19 +0100 (Sun, 10 Jun 2007) New Revision: 1055 Modified: trunk/templates/footer.tt Log: Remove element which wraps <div id=footer_delete_link>, since it's invalid markup and it wasn't doing anything anyway (fixes #221). Modified: trunk/templates/footer.tt =================================================================== --- trunk/templates/footer.tt 2007-06-10 13:45:21 UTC (rev 1054) +++ trunk/templates/footer.tt 2007-06-10 14:27:19 UTC (rev 1055) @@ -21,10 +21,8 @@ [% TRY %] [% INCLUDE custom_footer_credits.tt %] [% CATCH %] + [% INCLUDE delete_link %] - [% INCLUDE delete_link %] - - Powered by <a href="[% full_cgi_url%]?action=about">OpenGuides [% openguides_version %]</a>. [% IF licence_name %]

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

openguides-commits