Merged [5004] from jmh@joelhalpern.com:

Moe Replaced By: line i docent headers up to main header with Replaces:
 - Legacy-Id: 5018
Note: SVN reference [5004] has been migrated to Git commit 801dfc3a03d666e4f0a47302fb6f4c86298154f7
This commit is contained in:
Henrik Levkowetz 2012-11-07 13:11:29 +00:00
parent 2cfbe69ffb
commit d1360133c2
2 changed files with 1 additions and 6 deletions

View file

@ -223,12 +223,6 @@ class IdWrapper:
def friendly_state(self):
if self.draft_status == "RFC":
return "<a href=\"%s\">RFC %d</a>" % (reverse('doc_view', args=['rfc%d' % self.rfc_number]), self.rfc_number)
elif self.draft_status == "Replaced":
rs = self.replaced_by()
if rs:
return "Replaced by <a href=\"%s\">%s</a>" % (reverse('doc_view', args=[rs[0]]),rs[0], )
else:
return "Replaced"
elif self.draft_status == "Active":
if self.in_ietf_process():
if self.ietf_process.main_state == "Dead":

View file

@ -52,6 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<tr><td>Last updated:</td><td> {{ doc.publication_date|default:"(data missing)" }}</td></tr>
{% with doc.replaces as r %}{% if r %}<tr><td>Replaces:</td><td> {% filter urlize_ietf_docs %}{{ r|join:", "}}{% endfilter %}</td></tr>{% endif %}{% endwith %}
{% with doc.replaced_by as r %}{% if r %}<tr><td>Replaced by:</td><td> {% filter urlize_ietf_docs %}{{ r|join:", "}}{% endfilter %}</td></tr>{% endif %}{% endwith %}
{% with info.conflict_reviews as r %}{% if r %}<tr><td>IETF Conflict Review:</td><td> {% filter urlize_ietf_docs %}{{ r|join:","}}{% endfilter %}</td></tr>{% endif %} {% endwith %}