[Rt-commit] r11204 - in rtfm/branches/2.3-EXPERIMENTAL: .

[falcone at bestpractical.com]

Author: falcone
Date: Wed Mar 26 13:27:16 2008
New Revision: 11204

Modified:
   rtfm/branches/2.3-EXPERIMENTAL/   (props changed)
   rtfm/branches/2.3-EXPERIMENTAL/html/RTFM/Topics.html

Log:
 r30548 at ketch:  falcone | 2008-03-26 12:11:59 -0400
 * don't make the lowest topic a link.  It used to show article links
   but that hasn't been enabled for a long time, and it just adds a
   link that doesn't really go anywhere


Modified: rtfm/branches/2.3-EXPERIMENTAL/html/RTFM/Topics.html
==============================================================================
--- rtfm/branches/2.3-EXPERIMENTAL/html/RTFM/Topics.html	(original)
+++ rtfm/branches/2.3-EXPERIMENTAL/html/RTFM/Topics.html	Wed Mar 26 13:27:16 2008
@@ -233,16 +233,16 @@
     my $output;
 
     if (ref($topic) eq 'RT::FM::Topic') {
+
+        my $topic_info = $topic->Name() || loc("(no name)");
+        $topic_info .= ": " . $topic->Description() if $topic->Description;
+
 	if ($haschild) {
 	    $query = "Topics.html?id=" . $topic->Id . "&class=" . $c->Id;
+            $output = qq(<li><a href="$query">$topic_info</a>);
 	} else {
-	    $query = "Topics.html?id=" . $topic->Id . "&class=" . $c->Id .
-		"&showall=1";
-	}
-	
-	$output = "<li><a href=\"$query\">" . ($topic->Name() || loc("(no name)"));
-	$output .= ": " . $topic->Description() if $topic->Description();
-	$output .= "</a>";
+            $output = qq(<li>$topic_info);
+        }
 	
         my $Articles = RT::FM::ObjectTopicCollection->new($session{'CurrentUser'});
         $Articles->Limit(FIELD => 'ObjectType', VALUE => 'RT::FM::Article');