From ea639f96c46f8bbde64dc3caf321ed6f2edfa61a Mon Sep 17 00:00:00 2001
From: Bill Fenner <fenner@fenron.net>
Date: Mon, 11 Jun 2007 18:47:44 +0000
Subject: [PATCH] * Add filename_with_link to create links only for active
 documents * Display document status if it's not Active * Use revision_display
 in displayname() * Check for DocumentComment.created_by flag value of 999  -
 Legacy-Id: 317

---
 ietf/idtracker/models.py                        | 14 ++++++++++----
 ietf/templates/idtracker/idinternal_detail.html |  6 ++++--
 ietf/templates/idtracker/search_result_row.html |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ietf/idtracker/models.py b/ietf/idtracker/models.py
index 89301149b..de51e3217 100644
--- a/ietf/idtracker/models.py
+++ b/ietf/idtracker/models.py
@@ -147,7 +147,7 @@ class InternetDraft(models.Model):
         self.id_document_key = self.title.upper()
         super(InternetDraft, self).save()
     def displayname(self):
-	return "%s-%s.txt" % ( self.filename, self.revision )
+	return "%s-%s.txt" % ( self.filename, self.revision_display() )
     def doclink(self):
 	return "http://www.ietf.org/internet-drafts/%s" % ( self.displayname() )
     def group_acronym(self):
@@ -167,7 +167,11 @@ class InternetDraft(models.Model):
 	return "%02d" % r
     def doctype(self):
 	return "Draft"
-
+    def filename_with_link(self):
+	if self.status.status != 'Active':
+	    return self.filename
+	else:
+	    return '<a href="%s">%s</a>' % ( self.doclink(), self.filename )
     class Meta:
         db_table = "internet_drafts"
     class Admin:
@@ -335,6 +339,8 @@ class Rfc(models.Model):
 	return "http://www.ietf.org/rfc/%s" % ( self.displayname() )
     def doctype(self):
 	return "RFC"
+    def filename_with_link(self):
+	return '<a href="%s">%s</a>' % ( self.doclink(), self.displayname() )
     class Meta:
         db_table = 'rfcs'
 	verbose_name = 'RFC'
@@ -503,12 +509,12 @@ class DocumentComment(models.Model):
 	else:
 	    return "/idtracker/%s/comment/%d/" % (self.document.draft.filename, self.id)
     def get_author(self):
-	if self.created_by:
+	if self.created_by_id and self.created_by_id != 999:
 	    return self.created_by.__str__()
 	else:
 	    return "system"
     def get_username(self):
-	if self.created_by:
+	if self.created_by_id and self.created_by_id != 999:
 	    return self.created_by.login_name
 	else:
 	    return "system"
diff --git a/ietf/templates/idtracker/idinternal_detail.html b/ietf/templates/idtracker/idinternal_detail.html
index 17f8b3760..0a5a05307 100644
--- a/ietf/templates/idtracker/idinternal_detail.html
+++ b/ietf/templates/idtracker/idinternal_detail.html
@@ -29,8 +29,10 @@
 
               <td>
                 <div class="largefont3">
-                  <a href="{{ object.document.doclink }}">
-                  {{ object.document.displayname }}</a>
+		  {{ object.document.filename_with_link }}
+		  {% ifnotequal object.document.status.status "Active" %}
+		    ({{ object.document.status.status }})
+		  {% endifnotequal %}
 		  <font color="red">
 		  {% if object.via_rfc_editor %}
 		    (Independent submission via RFC Editor)
diff --git a/ietf/templates/idtracker/search_result_row.html b/ietf/templates/idtracker/search_result_row.html
index 2643d3e1d..4bf3f3f2d 100644
--- a/ietf/templates/idtracker/search_result_row.html
+++ b/ietf/templates/idtracker/search_result_row.html
@@ -5,7 +5,7 @@
              invalid HTML. -->
         <form method="GET" action="{% url ietf.idtracker.views.view_id match.document.filename %}"><td><input type="submit" value="DETAIL"></td></form>
 	{# todo: conditionalize doclink properly #}
-	<td>{% if match.primary_flag %}<li>{% else %}<dd>{% endif %}<a href="{{ match.document.doclink }}">{{ match.document.filename }}</a> ({{ match.document.intended_status }})</td>
+	<td>{% if match.primary_flag %}<li>{% else %}<dd>{% endif %}{{ match.document.filename_with_link }} ({{ match.document.intended_status }})</td>
 	<td>{{ match.document.revision }}</td>
 	<td>{{ match.job_owner }}</td>
 	<td>{% firstof match.status_date "" %}</td>