Skip to content

Commit 5a2ae19

Browse files
committed
Add support for conflict review documents in section 3.3 of agenda.json
- Legacy-Id: 4824
1 parent 6b82169 commit 5a2ae19

1 file changed

Lines changed: 12 additions & 6 deletions

File tree

ietf/iesg/views.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -304,20 +304,26 @@ def _agenda_json(request, date=None):
304304
for obj in docs[section]:
305305
d = obj['obj']
306306
docinfo = {'docname':d.canonical_name(),
307-
'rev':d.rev,
308307
'title':d.title,
309-
'intended-std-level':str(d.intended_std_level),
310308
'ad':d.ad.name}
311-
if d.rfc_number():
312-
docinfo['rfc-number'] = d.rfc_number()
313-
else:
314-
docinfo['rev'] = d.rev
315309
if d.note:
316310
docinfo['note'] = d.note
317311
defer = d.active_defer_event()
318312
if defer:
319313
docinfo['defer-by'] = defer.by.name
320314
docinfo['defer-at'] = str(defer.time)
315+
if d.type_id == 'conflrev':
316+
td = d.relateddocument_set.get(relationship__slug='conflrev').target.document
317+
docinfo['target-docname'] = td.canonical_name()
318+
docinfo['target-title'] = td.title
319+
docinfo['target-rev'] = td.rev
320+
docinfo['intended-std-level'] = str(td.intended_std_level)
321+
else:
322+
docinfo['intended-std-level'] = str(d.intended_std_level)
323+
if d.rfc_number():
324+
docinfo['rfc-number'] = d.rfc_number()
325+
else:
326+
docinfo['rev'] = d.rev
321327
data['sections'][s]['docs'] += [docinfo, ]
322328

323329
wgs = agenda_wg_actions(date)

0 commit comments

Comments
 (0)