c2c08c9edc
* Re-wrote the IPR declaration form using form.to_table() and the split_form() function in order to get sub-blocks of the form which could easily be used with the existing IPR detail display templates. How to merge forms from multiple models took some thinking; since the forms have a common ancestor, multiple inheritance doesn't preserve the form data. In the end the merging didn't turn out too horrible. See ipr.views.new(). * Changed the IprDetail model; first to specify editable=False for all fieleds which shouldn't be shown in the form, but this has the drawback of also removing them from the admin page form. Simply bagging them in an un-used sub block with split_form() works fine. * Changed the URLs for IPR by-date some again * Updated the ipr/new* templates to use the form sub-blocks - Legacy-Id: 97
124 lines
5 KiB
Python
124 lines
5 KiB
Python
import models
|
|
from django.shortcuts import render_to_response as render
|
|
import django.newforms as forms
|
|
import ietf.utils
|
|
|
|
def default(request):
|
|
"""Default page, with links to sub-pages"""
|
|
return render("ipr/disclosure.html", {})
|
|
|
|
def showlist(request):
|
|
"""Display a list of existing disclosures"""
|
|
return list(request, 'ipr/list.html')
|
|
|
|
def updatelist(request):
|
|
"""Display a list of existing disclosures, with links to update forms"""
|
|
return list(request, 'ipr/update_list.html')
|
|
|
|
def list(request, template):
|
|
"""Display a list of existing disclosures, using the provided template"""
|
|
disclosures = models.IprDetail.objects.all()
|
|
generic_disclosures = disclosures.filter(status__in=[1,3], generic=1)
|
|
specific_disclosures = disclosures.filter(status__in=[1,3], generic=0, third_party=0)
|
|
thirdpty_disclosures = disclosures.filter(status__in=[1,3], generic=0, third_party=1)
|
|
|
|
return render(template,
|
|
{
|
|
'generic_disclosures' : generic_disclosures.order_by(* ['-submitted_date', ] ),
|
|
'specific_disclosures': specific_disclosures.order_by(* ['-submitted_date', ] ),
|
|
'thirdpty_disclosures': thirdpty_disclosures.order_by(* ['-submitted_date', ] ),
|
|
} )
|
|
|
|
def show(request, ipr_id=None):
|
|
"""Show a specific IPR disclosure"""
|
|
assert ipr_id != None
|
|
ipr = models.IprDetail.objects.filter(ipr_id=ipr_id)[0]
|
|
ipr.disclosure_type = get_disclosure_type(ipr)
|
|
try:
|
|
ipr.holder_contact = ipr.contact.filter(contact_type=1)[0]
|
|
except IndexError:
|
|
ipr.holder_contact = ""
|
|
try:
|
|
ipr.ietf_contact = ipr.contact.filter(contact_type=2)[0]
|
|
except IndexError:
|
|
ipr.ietf_contact = ""
|
|
try:
|
|
ipr.submitter = ipr.contact.filter(contact_type=3)[0]
|
|
except IndexError:
|
|
ipr.submitter = ""
|
|
|
|
if ipr.generic:
|
|
return render("ipr/details_generic.html", {"ipr": ipr})
|
|
if ipr.third_party:
|
|
return render("ipr/details_thirdpty.html", {"ipr": ipr})
|
|
else:
|
|
return render("ipr/details_specific.html", {"ipr": ipr})
|
|
|
|
|
|
def update(request, ipr_id=None):
|
|
"""Update a specific IPR disclosure"""
|
|
# TODO: replace the placeholder code with the appropriate update code
|
|
return show(request, ipr_id)
|
|
|
|
def new(request, type):
|
|
"""Form to make a new IPR disclosure"""
|
|
debug = ""
|
|
sections = {
|
|
"section1": "p_h_legal_name ",
|
|
"section2": "ph_name ph_title ph_department ph_address1 ph_address2 ph_telephone ph_fax ph_email",
|
|
"section3": "ietf_name ietf_title ietf_department ietf_address1 ietf_address2 ietf_telephone ietf_fax ietf_email",
|
|
"section4": "rfclist draftlist other_designations",
|
|
"section5": "p_applications date_applied country selecttype p_notes discloser_identify",
|
|
"section6": "licensing_option stdonly_license comments lic_checkbox selectowned",
|
|
"section7": "sub_name sub_title sub_department sub_address1 sub_address2 sub_telephone sub_fax sub_email",
|
|
"section8": "other_notes",
|
|
"ignore" : "document_title rfc_number id_document_tag submitted_date status " +
|
|
"old_ipr_url additional_old_title1 additional_old_title2 " +
|
|
"additional_old_url1 additional_old_url2 update_notified_date",
|
|
}
|
|
IprForm = forms.form_for_model(models.IprDetail, formfield_callback=detail_field_fixup)
|
|
ContactForm = forms.form_for_model(models.IprContact)
|
|
|
|
# It would be nicer if we could use mixin subclassing, but that won't
|
|
# work with multiple classes with the same elements.
|
|
for prefix in ["ph", "ietf", "sub"]:
|
|
for field in ContactForm.base_fields:
|
|
IprForm.base_fields[prefix + "_" + field] = ContactForm.base_fields[field]
|
|
|
|
# Some extra fields which will get post-processing to generate the IprRfcs
|
|
# and IprDrafts entries which go into the database:
|
|
IprForm.base_fields["rfclist"] = forms.CharField(required=False)
|
|
IprForm.base_fields["draftlist"] = forms.CharField(required=False)
|
|
IprForm.base_fields["stdonly_license"] = forms.BooleanField(required=False)
|
|
|
|
if request.method == 'POST':
|
|
form = IprForm(request.POST)
|
|
if form.is_valid():
|
|
form.save()
|
|
return HttpResponseRedirect("/ipr/")
|
|
else:
|
|
form = IprForm()
|
|
|
|
blocks = ietf.utils.split_form(form.as_table(), sections )
|
|
|
|
return render("ipr/new_%s.html" % type, {"ipr": form, "form": blocks})
|
|
|
|
def detail_field_fixup(field):
|
|
if field.name == "licensing_option":
|
|
return forms.IntegerField(widget=forms.RadioSelect(choices=models.LICENSE_CHOICES))
|
|
if field.name in ["selecttype", "selectowned"]:
|
|
return forms.IntegerField(widget=forms.RadioSelect(choices=((1, "YES"), (2, "NO"))))
|
|
return field.formfield()
|
|
|
|
|
|
# ---- Helper functions ------------------------------------------------------
|
|
|
|
def get_disclosure_type(ipr):
|
|
if ipr.generic:
|
|
assert not ipr.third_party
|
|
return "Generic"
|
|
if ipr.third_party:
|
|
return "Third Party"
|
|
else:
|
|
return "Specific"
|