Changeset 1269

Timestamp:

06/19/09 23:41:38 (15 months ago)

Author:

dom

Message:

Don't display revision info for nodes that don't exist (fixes #193)

Location:

trunk

Files:

• Changes (modified) (1 diff)
• lib/OpenGuides.pm (modified) (1 diff)
• t/51_display_node.t (modified) (2 diffs)
• templates/navbar.tt (modified) (1 diff)
• templates/node.tt (modified) (1 diff)

trunk/Changes

@@ -6 +6 @@
 0.65
         Fix some more broken POD and add POD unit test (#268)
+        Don't display revision info for nodes that don't exist (#193)
 
 0.64    23 February 2009

trunk/lib/OpenGuides.pm

@@ -288 +288 @@
                    wgs84_lat     => $wgs84_lat
                );
+
+    $tt_vars{empty_node} = !($tt_vars{content} ||
+                             $tt_vars{coord_field_1_value} ||
+                             $tt_vars{coord_field_2_value} ||
+                             $tt_vars{latitude} ||
+                             $tt_vars{longitude});
 
     # Hide from search engines if showing a specific version.

trunk/t/51_display_node.t

@@ -14 +14 @@
 }
 
-plan tests => 15;
+plan tests => 18;
 
 Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } );
@@ -111 +111 @@
 like( $output, qr{\Q<a href="wiki.cgi?Locale_Does_Exist"},
     "wrongly-cased locales are linked as they should be" );
+
+$output = $guide->display_node( id => "Does not exist",
+                                return_output => 1
+                              );
+like( $output, qr{\QWe don't have a node called "Does not exist".},
+    "not found message shows up" );
+unlike( $output, qr{\QRevision 0},
+    "bogus revision number doesn't show up" );
+unlike( $output, qr{\QLast edited},
+    "bogus last edited doesn't show up" );

trunk/templates/navbar.tt

@@ -13 +13 @@
   [% INCLUDE navbar_locales.tt %]
  </div>
+[% UNLESS empty_node %]
   [% INCLUDE navbar_revision_info.tt %]
+[% END %]
 
 </div>

trunk/templates/node.tt

@@ -69 +69 @@
   </h2>
 [% END %]
-[% IF not (content || coord_field_1_value || coord_field_2_value || latitude || longitude) %]
+[% IF empty_node %]
 </div>
 <div id="nonexistent_node_message">We don't have a node called "[% node_name %]". Would you like to <a href="[% full_cgi_url %]?action=edit;id=[% node_param %]">create it</a>?</div>