Changeset 1095

Timestamp:

06/20/07 17:34:42 (16 months ago)

Author:

dom

Message:

Only linkify categories and locales if they exist (fixes #15)

Location:

trunk

Files:

• lib/OpenGuides/Template.pm (modified) (1 diff)
• t/51_display_node.t (modified) (2 diffs)
• templates/display_metadata.tt (modified) (2 diffs)

trunk/lib/OpenGuides/Template.pm

@@ -320 +320 @@
 
     my @categories = map { { name => $_,
-                             url  => "$script_name?Category_"
-            . uri_escape($formatter->node_name_to_node_param($_)) } } @catlist;
+                             url  => $args{wiki}->node_exists( "Category_" . $formatter->node_name_to_node_param($_)) ? "$script_name?Category_"
+            . uri_escape($formatter->node_name_to_node_param($_)) : "" } } @catlist;
 
     my @locales    = map { { name => $_,
-                             url  => "$script_name?Locale_"
-            . uri_escape($formatter->node_name_to_node_param($_)) } } @loclist;
+                             url  => $args{wiki}->node_exists( "Locale_" . $formatter->node_name_to_node_param($_)) ? "$script_name?Locale_"
+            . uri_escape($formatter->node_name_to_node_param($_)) : "" } } @loclist;
 
     # The 'website' attribute might contain a URL so we wiki-format it here

trunk/t/51_display_node.t

@@ -13 +13 @@
 }
 
-plan tests => 9;
+plan tests => 13;
 
+Wiki::Toolkit::Setup::SQLite::cleardb( { dbname => "t/node.db" } );
 Wiki::Toolkit::Setup::SQLite::setup( { dbname => "t/node.db" } );
 my $config = OpenGuides::Config->new(
@@ -61 +62 @@
 
 unlike( $output, qr{^\QLocation: }ms, '...but not with redirect=0' );
+
+$wiki->write_node( "Non-existent categories and locales", "foo", undef,
+                                { category => [ "Does not exist" ],
+                                  locale   => [ "Does not exist" ] } );
+
+$output = $guide->display_node( id => 'Non-existent categories and locales',
+                                return_output => 1
+                              );
+
+unlike( $output, qr{\Q<a href="wiki.cgi?Category_Does_Not_Exist"},
+    'Category name not linked if category does not exist' );
+
+$wiki->write_node( "Category_Does_Not_Exist", "bar", undef, undef );
+
+$output = $guide->display_node( id => 'Non-existent categories and locales',
+                                return_output => 1
+                              );
+
+like( $output, qr{\Q<a href="wiki.cgi?Category_Does_Not_Exist"},
+    'but does when it does exist' );
+
+unlike( $output, qr{\Q<a href="wiki.cgi?Locale_Does_Not_Exist"},
+    'Locale name not linked if category does not exist' );
+
+$wiki->write_node( "Locale_Does_Not_Exist", "wibble", undef, undef );
+
+$output = $guide->display_node( id => 'Non-existent categories and locales',
+                                return_output => 1
+                              );
+
+like( $output, qr{\Q<a href="wiki.cgi?Locale_Does_Not_Exist"},
+    'but does when it does exist' );
+
+

trunk/templates/display_metadata.tt

@@ -82 +82 @@
         <span class="metadata_label">Categories:</span>
         [% FOREACH category = categories %]
-          <a href="[% category.url %]" class="category">[% category.name %]</a>[%- "," UNLESS loop.last %]
+          [% IF category.url != "" %]
+            <a href="[% category.url %]" class="category">[% category.name %]</a>[%- "," UNLESS loop.last %]
+          [% ELSE %]
+            [% category.name %][%- "," UNLESS loop.last %]
+          [% END %]
         [% END %]
       </li>
@@ -91 +95 @@
         <span class="metadata_label">Locales:</span>
         [% FOREACH locale = locales %]
-          <a href="[% locale.url %]" class="addr locality">[% locale.name %]</a>[%- "," UNLESS loop.last %]
+          [% IF locale.url != "" %]
+            <a href="[% locale.url %]" class="addr locality">[% locale.name %]</a>[%- "," UNLESS loop.last %]
+          [% ELSE %]
+            [% locale.name %][%- "," UNLESS loop.last %]
+          [% END %]
         [% END %]
       </li>