From 5fae7d56b29ef621f715f1153bdebd10221b44e9 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Wed, 13 Jun 2007 14:05:26 +0000
Subject: [PATCH] Fixing some template changes needed after the model surgery
in changeset [186], and extending the attribute alignment to IprRfc and
IprDraft models. - Legacy-Id: 363 Note: SVN reference [186] has been
migrated to Git commit 5f4d99a36a52ed1a148d1ecef4b5ab39b1639244
---
ietf/ipr/models.py | 2 +-
ietf/templates/idindex/internetdraft_detail.html | 2 +-
ietf/templates/ipr/details.html | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ietf/ipr/models.py b/ietf/ipr/models.py
index 79d7561dd..732b74348 100644
--- a/ietf/ipr/models.py
+++ b/ietf/ipr/models.py
@@ -190,7 +190,7 @@ class IprNotification(models.Model):
class IprRfc(models.Model):
ipr = models.ForeignKey(IprDetail, edit_inline=True, related_name='rfcs')
- rfc_number = models.ForeignKey(Rfc, db_column='rfc_number', raw_id_admin=True, core=True)
+ document = models.ForeignKey(Rfc, db_column='rfc_number', raw_id_admin=True, core=True)
def __str__(self):
return "%s applies to RFC%04d" % ( self.ipr, self.rfc_number )
class Meta:
diff --git a/ietf/templates/idindex/internetdraft_detail.html b/ietf/templates/idindex/internetdraft_detail.html
index 78dd8d81f..982fc073b 100644
--- a/ietf/templates/idindex/internetdraft_detail.html
+++ b/ietf/templates/idindex/internetdraft_detail.html
@@ -13,7 +13,7 @@
{% else %}
<li> <b>IETF Working Group: <a href="http://www.ietf.org/html.charters/{{ object.group.acronym }}-charter.html">{{ object.group.name }}</a></li>
{% endifequal %}
-<li> <b>I-D Title:</b> {{ object.id_document_name }}</li>
+<li> <b>I-D Title:</b> {{ object.title }}</li>
<li> <b>I-D Status:</b> {{ object.status }}
{% ifequal object.status.status "Replaced" %}
(by <a href="/idindex/{{object.replaced_by.filename}}/">{{ object.replaced_by.filename }}</a>)
diff --git a/ietf/templates/ipr/details.html b/ietf/templates/ipr/details.html
index f2e6efdb3..76b2018b1 100644
--- a/ietf/templates/ipr/details.html
+++ b/ietf/templates/ipr/details.html
@@ -258,15 +258,15 @@
{% if ipr.rfclist %}
<tr class="{% cycle row_parity %}"><td class="fixwidth">RFC Numbers:</td><td><b>{{ ipr.rfclist }}</b></td></tr>
{% else %}
- {% for rfc in ipr.rfcs.all %}
- <tr class="{% cycle row_parity %}"><td class="fixwidth"><b>RFC {{ rfc.rfc_number.rfc_number }}:</b></td><td><b>"{{ rfc.rfc_number.rfc_name }}"</b></td></tr>
+ {% for doc in ipr.rfcs.all %}
+ <tr class="{% cycle row_parity %}"><td class="fixwidth"><b>RFC {{ doc.document.rfc_number }}:</b></td><td><b>"{{ doc.document.title }}"</b></td></tr>
{% endfor %}
{% endif %}
{% if ipr.draftlist %}
<tr class="{% cycle row_parity %}"><td class="fixwidth">I-D Filenames (draft-...):</td><td><b>{{ ipr.draftlist }}</b></td></tr>
{% else %}
- {% for draft in ipr.drafts.all %}
- <tr class="{% cycle row_parity %}"><td class="fixwidth">Internet-Draft:</td><td><b>"{{ draft.document.id_document_name }}"<br />(<tt><big>{{ draft.document.filename }}-{{ draft.document.revision }}</big></tt>)</b></td></tr>
+ {% for doc in ipr.drafts.all %}
+ <tr class="{% cycle row_parity %}"><td class="fixwidth">Internet-Draft:</td><td><b>"{{ doc.document.title }}"<br />(<tt><big>{{ doc.document.filename }}-{{ doc.document.revision }}</big></tt>)</b></td></tr>
{% endfor %}
{% endif %}
{% if ipr.other_designations %}