68d4a58fa7
using pretty much the same template as for a non-form view. This solution is less hackish than the previous one which used the form.as_table() rendering of a form, and then split the resulting html in chunks. Instead, '''all''' the html has been moved out to a formfield template, and a custom form class is generated which will render the form elements using an indicated template. * Add form factory in utils.py (an old version which still has html in the code is there for history, but will be removed * Changes in ipr/views.py:new(), now subclassing one form with some class members being other form instances, matching the members used for the show() view * A fix in ipr/models, making an email field use models.EmailField * Reverting a number of changes in ipr/details.html which aren't needed any more, as well as in ipr/new.html; and adding ipr/formfield.html - Legacy-Id: 104
115 lines
4.3 KiB
Python
115 lines
4.3 KiB
Python
import models
|
|
from django.shortcuts import render_to_response as render
|
|
import django.newforms as forms
|
|
import ietf.utils
|
|
import syslog
|
|
|
|
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):
|
|
"""Make a new IPR disclosure"""
|
|
debug = ""
|
|
|
|
# CustomForm = mk_formatting_form(format="%(errors)s%(field)s%(help_text)s")
|
|
CustomForm = ietf.utils.makeFormattingForm(template="ipr/formfield.html")
|
|
BaseIprForm = forms.form_for_model(models.IprDetail, form=CustomForm, formfield_callback=detail_field_fixup)
|
|
ContactForm = forms.form_for_model(models.IprContact, form=CustomForm)
|
|
|
|
# Some subclassing:
|
|
class IprForm(BaseIprForm):
|
|
holder_contact = None
|
|
rfclist = forms.CharField(required=False)
|
|
draftlist = forms.CharField(required=False)
|
|
stdonly_license = forms.BooleanField(required=False)
|
|
def __init__(self, *args, **kw):
|
|
self.base_fields["holder_contact"] = ContactForm(prefix="ph", *args, **kw)
|
|
# syslog.syslog("IprForm.__init__: holder_contact: %s" % repr(self.base_fields["holder_contact"]))
|
|
|
|
self.base_fields["ietf_contact"] = ContactForm(prefix="ietf", *args, **kw)
|
|
self.base_fields["submitter"] = ContactForm(prefix="sub", *args, **kw)
|
|
BaseIprForm.__init__(self, *args, **kw)
|
|
|
|
if request.method == 'POST':
|
|
form = IprForm(request.POST)
|
|
if form.is_valid():
|
|
form.save()
|
|
return HttpResponseRedirect("/ipr/")
|
|
else:
|
|
form = IprForm()
|
|
|
|
return render("ipr/new_%s.html" % type, {"ipr": form, "debug": ""})
|
|
|
|
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"
|