Skip to content

Commit 4647240

Browse files
committed
Changed the IPR disclosure page for IPR disclosure updates to show both the previous and current disclosure details side-by-side. Fixes issue ietf-tools#2414.
- Legacy-Id: 14581
1 parent 717868c commit 4647240

3 files changed

Lines changed: 230 additions & 95 deletions

File tree

ietf/ipr/views.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,12 +769,17 @@ def show(request, id):
769769
elif ipr.state.slug != 'posted':
770770
raise Http404
771771

772+
updates_iprs = ipr.relatedipr_source_set.all().order_by('source__time')
773+
prev_rel = updates_iprs.last()
774+
prev = prev_rel.target.get_child() if prev_rel else None
775+
772776
return render(request, "ipr/details_view.html", {
773777
'ipr': ipr,
778+
'prev': prev,
774779
'in_force_ipr_rfc': ipr_rfc_number(ipr.time, ipr.is_thirdparty),
775780
'tabs': get_details_tabs(ipr, 'Disclosure'),
776781
'choices_abc': [ i.desc for i in IprLicenseTypeName.objects.filter(slug__in=['no-license', 'royalty-free', 'reasonable', ]) ],
777-
'updates_iprs': ipr.relatedipr_source_set.all().order_by('source__time'),
782+
'updates_iprs': updates_iprs,
778783
'updated_by_iprs': ipr.relatedipr_target_set.filter(source__state="posted").order_by('target__time')
779784
})
780785

ietf/static/ietf/css/ietf.css

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -753,6 +753,23 @@ blockquote {
753753
}
754754

755755

756+
.table-condensed th.ipr-label {
757+
overflow: hidden;
758+
clear: left;
759+
text-align: right;
760+
text-overflow: ellipsis;
761+
padding-right: 1em;
762+
vertical-align: top;
763+
}
764+
.table-condensed .ipr-prev {
765+
color: #777;
766+
background-color: #f0f0f0;
767+
vertical-align: top;
768+
}
769+
.table-condensed .ipr-this {
770+
vertical-align: top;
771+
}
772+
756773
.rfcmarkup div {
757774
margin-top: 1em;
758775
}

0 commit comments

Comments
 (0)