From e830f0f9768b3cdbfb9d72aa61e0b2b33c3117b5 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Tue, 27 Mar 2018 10:40:59 +0000 Subject: [PATCH] Fill in the IPR edit form, section V, with patent information derived from the patent_info field, the same way we do for the IPR update form. - Legacy-Id: 14950 --- ietf/ipr/views.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/ietf/ipr/views.py b/ietf/ipr/views.py index f03dde2d3..d2a5b4153 100644 --- a/ietf/ipr/views.py +++ b/ietf/ipr/views.py @@ -338,10 +338,18 @@ def edit(request, id, updates=None): return redirect("ietf.ipr.views.show", id=ipr.id) else: - if ipr.updates: - form = ipr_form_mapping[ipr.__class__.__name__](instance=ipr,initial={'updates':[ x.target for x in ipr.updates ]}) + initial = model_to_dict(ipr) + patent_info = text_to_dict(initial.get('patent_info', u'')) + if patent_info.keys(): + patent_dict = dict([ ('patent_'+k.lower(), v) for k,v in patent_info.items() ]) else: - form = ipr_form_mapping[ipr.__class__.__name__](instance=ipr) + patent_dict = {'patent_notes': initial.get('patent_info', u'')} + initial.update(patent_dict) + if ipr.updates: + initial.update({'updates':[ x.target for x in ipr.updates ]}) + form = ipr_form_mapping[ipr.__class__.__name__](instance=ipr, initial=initial) + else: + form = ipr_form_mapping[ipr.__class__.__name__](instance=ipr, initial=initial) #disclosure = IprDisclosureBase() # dummy disclosure for inlineformset draft_formset = DraftFormset(instance=ipr, queryset=IprDocRel.objects.all())