diff --git a/ietf/ipr/new.py b/ietf/ipr/new.py index ebc0bd14b..782788e1d 100644 --- a/ietf/ipr/new.py +++ b/ietf/ipr/new.py @@ -7,6 +7,7 @@ from datetime import datetime from django.shortcuts import render_to_response as render from django.template import RequestContext from ietf.utils import log +from ietf.utils.mail import send_mail from ietf.ipr.view_sections import section_table from ietf.idtracker.models import Rfc, InternetDraft from django.http import HttpResponseRedirect @@ -209,7 +210,7 @@ def new(request, type, update=None): form = IprForm(data) if form.is_valid(): # Save data : - # IprDetail, IprContact+, IprDraft+, IprRfc+, IprNotification + # IprDetail, IprUpdate, IprContact+, IprDraft+, IprRfc+, IprNotification # Save IprDetail instance = form.save(commit=False) @@ -250,6 +251,14 @@ def new(request, type, update=None): pass contact = models.IprContact(**cdata) contact.save() + # store this contact in the instance for the email + # similar to what views.show() does + if prefix == "hold": + instance.holder_contact = contact + elif prefix == "ietf": + instance.ietf_contact = contact + elif prefix == "subm": + instance.submitter = contact # contact = ContactForm(cdata) # if contact.is_valid(): # contact.save() @@ -268,10 +277,8 @@ def new(request, type, update=None): iprrfc = models.IprRfc(document=rfc, ipr=instance) iprrfc.save() - return HttpResponseRedirect("/ipr/ipr-%s" % instance.ipr_id) - #return HttpResponseRedirect("/ipr/") - - pass + send_mail(request, ['ietf-ipr@ietf.org', 'sunny.lee@neustar.biz'], ('IPR Submitter App', 'ietf-ipr@ietf.org'), 'New IPR Submission Notification', "ipr/new_update_email.txt", {"ipr": instance, "update": update}) + return render("ipr/submitted.html", {"update": update}, context_instance=RequestContext(request)) else: if form.ietf_contact_is_submitter: form.ietf_contact_is_submitter_checked = "checked" diff --git a/ietf/templates/ipr/details.txt b/ietf/templates/ipr/details.txt new file mode 100644 index 000000000..0c99e3107 --- /dev/null +++ b/ietf/templates/ipr/details.txt @@ -0,0 +1,78 @@ +IPR Title: {{ ipr.title }} + +Section I. Patent Holder/Applicant ("Patent Holder") +Legal Name: {{ ipr.legal_name }} + +Section II. Patent Holder's Contact for License Application +Name: {{ ipr.holder_contact.name }} +Title: {{ ipr.holder_contact.title }} +Department: {{ ipr.holder_contact.department }} +Address1: {{ ipr.holder_contact.address1 }} +Address2: {{ ipr.holder_contact.address2 }} +Telephone: {{ ipr.holder_contact.telephone }} +Fax: {{ ipr.holder_contact.fax }} +Email: {{ ipr.holder_contact.email }} + +Section III. Contact Information for the IETF Participant Whose Personal Belief Triggered +the Disclosure in this Template (Optional): +Name: {{ ipr.ietf_contact.name }} +Title: {{ ipr.ietf_contact.title }} +Department: {{ ipr.ietf_contact.department }} +Address1: {{ ipr.ietf_contact.address1 }} +Address2: {{ ipr.ietf_contact.address2 }} +Telephone: {{ ipr.ietf_contact.telephone }} +Fax: {{ ipr.ietf_contact.fax }} +Email: {{ ipr.ietf_contact.email }} + +Section IV. IETF Document or Working Group Contribution to Which Patent Disclosure +Relates +${doc_title_line}RFC Number(s) : {% for doc in ipr.rfcs.all %}{{ doc.document.rfc_number }}{% if not forloop.last %}, {% endif %}{% endfor %} +I-D File Name(s)(draft-...) : {% for doc in ipr.drafts.all %}{{ doc.document.displayname }}{% if not forloop.last %}, {% endif %}{% endfor %} +Designations for Other Contributions : {{ ipr.other_designations }} + +Section V. Disclosure of Patent Information (i.e., patents or patent applications +required to be disclosed by Section 6 of RFC 3979) +A. For granted patents or published pending patent applications, please provide +the following information: +Patent, Serial, Publication, Registration, or Application/File number(s) : {{ ipr.patents }} +Date(s) granted or applied for : {{ ipr.date_applied }} +Country : {{ ipr.country }} +Additional Note(s): +{{ ipr.notes }} +B. Does your disclosure relate to an unpublished pending patent application? {{ ipr.get_is_pending_display }} +{# missing ipr.applies_to_all #} +C. If an Internet-Draft or RFC includes multiple parts and it is not reasonably apparent which part of such Internet-Draft or RFC is alleged to be covered by +the patent information disclosed in Section V(A) or V(B), it is helpful if the +discloser identifies here the sections of the Internet-Draft or RFC that are +alleged to be so covered. : +{{ ipr.document_sections }} + +Section VI. Licensing Declaration The Patent Holder states that, upon approval by the IESG for publication as an +RFC of the relevant IETF specification, its position with respect to licensing +any patent claims contained in the patent(s) or patent application(s) disclosed +above that would be necessary to implement the technology required by such IETF +specification ("Patent Claims"), for the purpose of implementing the specification, is as follows(select one licensing declaration option only): + +Selection: +{{ ipr.get_licensing_option_display }} +{% if ipr.stdonly_license %} +{{ ipr.stdonly_license }} +Above licensing declaration is limited solely to standards-track IETF documents. +{% endif %} +Licensing information, comments, notes or URL for further information : +{{ ipr.comments }} + +Section VII. Contact Information of Submitter of this Form (if different from +IETF Participant in Section III above) +Name: {{ ipr.submitter.name }} +Title: {{ ipr.submitter.title }} +Department: {{ ipr.submitter.department }} +Address1: {{ ipr.submitter.address1 }} +Address2: {{ ipr.submitter.address2 }} +Telephone: {{ ipr.submitter.telephone }} +Fax: {{ ipr.submitter.fax }} +Email: {{ ipr.submitter.email }} + +Section VIII. Other Note(s): +{{ ipr.other_notes }} + diff --git a/ietf/templates/ipr/new_update_email.txt b/ietf/templates/ipr/new_update_email.txt new file mode 100644 index 000000000..1865cf8cd --- /dev/null +++ b/ietf/templates/ipr/new_update_email.txt @@ -0,0 +1,5 @@ +A new IPR disclosure has been submitted. +Please check it and post it. +https://datatracker.ietf.org/cgi-bin/ipr_admin/ipr_admin.cgi + +{% include "ipr/details.txt" %} diff --git a/ietf/templates/ipr/submitted.html b/ietf/templates/ipr/submitted.html new file mode 100644 index 000000000..ec8856cb5 --- /dev/null +++ b/ietf/templates/ipr/submitted.html @@ -0,0 +1,15 @@ +{% extends "base.html" %} +{% block title %}IPR Submission{% endblock %} +{% block content %} + +
+ Your IPR disclosure has been submitted, and the IETF Secretariat has been notified.
+ +Please note that it may take one business day for your IPR disclosure to be posted
+on the IETF Page of Intellectual Property Rights Notices.

+ + +
+ Back to IPR Disclosure Page
+ +{% endblock %}