[Rt-commit] r3632 - in rtfm/branches/2.1-TESTING: . html/RTFM html/RTFM/Article html/RTFM/Article/Elements html/RTFM/Elements

[alexmv at bestpractical.com]

Author: alexmv
Date: Wed Aug 10 20:27:31 2005
New Revision: 3632

Modified:
   rtfm/branches/2.1-TESTING/   (props changed)
   rtfm/branches/2.1-TESTING/html/RTFM/Article/Display.html
   rtfm/branches/2.1-TESTING/html/RTFM/Article/Elements/EditTopics
   rtfm/branches/2.1-TESTING/html/RTFM/Elements/ShowTopic
   rtfm/branches/2.1-TESTING/html/RTFM/Topics.html
Log:
 r5772 at zoq-fot-pik:  chmrr | 2005-08-10 20:24:05 -0400
  * Allow better for unnamed articles and topics


Modified: rtfm/branches/2.1-TESTING/html/RTFM/Article/Display.html
==============================================================================
--- rtfm/branches/2.1-TESTING/html/RTFM/Article/Display.html	(original)
+++ rtfm/branches/2.1-TESTING/html/RTFM/Article/Display.html	Wed Aug 10 20:27:31 2005
@@ -55,7 +55,7 @@
 unless ( $article->CurrentUserHasRight('ShowArticle') ) {
     $m->comp( "/RTFM/Elements/Error", Why => loc("Permission Denied") );
 }
-my $title = loc( "Article #[_1]: [_2]", $article->Id, $article->Name );
+my $title = loc( "Article #[_1]: [_2]", $article->Id, $article->Name || loc("(no name)"));
 
 $id = $article->id;
 

Modified: rtfm/branches/2.1-TESTING/html/RTFM/Article/Elements/EditTopics
==============================================================================
--- rtfm/branches/2.1-TESTING/html/RTFM/Article/Elements/EditTopics	(original)
+++ rtfm/branches/2.1-TESTING/html/RTFM/Article/Elements/EditTopics	Wed Aug 10 20:27:31 2005
@@ -27,7 +27,7 @@
     my $topic = $tree->getNodeValue;
     $m->print("<option value=\"".$topic->Id."\""
       .(exists $topics{$topic->Id} ? " selected" : "").">"
-      .("&nbsp;" x ($tree->getDepth*5)).$topic->Name."</option>\n");
+      .("&nbsp;" x ($tree->getDepth*5)).($topic->Name || loc("(no name)"))."</option>\n");
   });
 }
 unless ($OnlyThisClass) {
@@ -44,7 +44,7 @@
     }
     $m->print("<option value=\"".$topic->Id."\""
       .(exists $topics{$topic->Id} ? " selected" : "").">"
-      .("&nbsp;" x ($tree->getDepth*5)).$topic->Name."</option>\n");
+      .("&nbsp;" x ($tree->getDepth*5)).($topic->Name || loc("(no name)"))."</option>\n");
   });
 </%perl>
 </optgroup>

Modified: rtfm/branches/2.1-TESTING/html/RTFM/Elements/ShowTopic
==============================================================================
--- rtfm/branches/2.1-TESTING/html/RTFM/Elements/ShowTopic	(original)
+++ rtfm/branches/2.1-TESTING/html/RTFM/Elements/ShowTopic	Wed Aug 10 20:27:31 2005
@@ -17,7 +17,7 @@
 %# END LICENSE BLOCK
 
 % for (@path) {
-<% $_->ParentObj->Id ? " > " : "" %><a href="<% $RT::WebPath %>/RTFM/Topics.html?class=<% $_->ObjectId %>&id=<% $_->Id %>"><% $_->Name %></a>
+<% $_->ParentObj->Id ? " > " : "" %><a href="<% $RT::WebPath %>/RTFM/Topics.html?class=<% $_->ObjectId %>&id=<% $_->Id %>"><% $_->Name || loc("(no name)") %></a>
 % }
 
 <%args>

Modified: rtfm/branches/2.1-TESTING/html/RTFM/Topics.html
==============================================================================
--- rtfm/branches/2.1-TESTING/html/RTFM/Topics.html	(original)
+++ rtfm/branches/2.1-TESTING/html/RTFM/Topics.html	Wed Aug 10 20:27:31 2005
@@ -72,7 +72,7 @@
 % while (my $obj = $Articles->Next) {
 %   my $a = RT::FM::Article->new($session{'CurrentUser'});
 %   $a->Load($obj->ObjectId);
-<li><a href="Article/Display.html?id=<% $a->Id %>"><% $a->Name %></a></li>
+<li><a href="Article/Display.html?id=<% $a->Id %>"><% $a->Name || loc("(no name)") %></a></li>
 % }
 </ul>
 % } else {
@@ -170,7 +170,7 @@
 		"&showall=1";
 	}
 	
-	$output = "<li><a href=\"$query\">" . $topic->Name();
+	$output = "<li><a href=\"$query\">" . ($topic->Name() || loc("(no name)");
 	$output .= ": " . $topic->Description() if $topic->Description();
 	$output .= "</a>";