Skip to content

Commit f121038

Browse files
committed
Merged in [12338] from rjsparks@nostrum.com:
Modified the RFC feed to better support digital preservation. Fix an issue with the agenda linking to group type \'other\' slides. Will patch production. - Legacy-Id: 12346 Note: SVN reference [12338] has been migrated to Git commit ab96f6c
2 parents 7d44335 + ab96f6c commit f121038

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

ietf/doc/feeds.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,10 @@ def items(self):
120120
return [doc for doc,time in results]
121121

122122
def item_title(self, item):
123-
return item.canonical_name()
123+
return "%s : %s" % (item.canonical_name(),item.title)
124124

125125
def item_description(self, item):
126-
return item.title
126+
return item.abstract
127127

128128
def item_link(self, item):
129129
return "https://rfc-editor.org/info/%s"%item.canonical_name()
@@ -133,7 +133,6 @@ def item_pubdate(self, item):
133133

134134
def item_extra_kwargs(self, item):
135135
extra = super(RfcFeed, self).item_extra_kwargs(item)
136-
extra.update({'dcterms_abstract': item.abstract})
137136
extra.update({'dcterms_accessRights': 'gratis'})
138137
extra.update({'dcterms_format': 'text/html'})
139138
extra.update({'media_content': {'url': 'https://rfc-editor.org/rfc/%s.txt' % item.canonical_name(),

ietf/templates/meeting/agenda.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ <h2>
208208
<span class="hidden-xs">
209209
{% if item.timeslot.type.slug == 'other' %}
210210
{% for slide in item.session.slides %}
211-
<a href="https://www.ietf.org/proceedings/{{meeting_num}}/slides/{{ slide.external_url }}">{{ slide.title|clean_whitespace }}</a>
211+
<a href="{{slide.get_absolute_url}}">{{ slide.title|clean_whitespace }}</a>
212212
<br>
213213
{% endfor %}
214214
{% endif %}

0 commit comments

Comments
 (0)