Tweaked the IPR Details page to show the possible a), b), and c) choices under section 'V' when licensing declaration to be provided later has been chosen.
- Legacy-Id: 12793
This commit is contained in:
parent
db1cc15f1f
commit
6c3a4015c5
|
@ -32,6 +32,7 @@ from ietf.ipr.utils import (get_genitive, get_ipr_summary,
|
|||
iprs_from_docs, related_docs)
|
||||
from ietf.message.models import Message
|
||||
from ietf.message.utils import infer_message
|
||||
from ietf.name.models import IprLicenseTypeName
|
||||
from ietf.person.models import Person
|
||||
from ietf.secr.utils.document import get_rfc_num, is_draft
|
||||
from ietf.utils.draft_search import normalize_draftname
|
||||
|
@ -703,6 +704,7 @@ def get_details_tabs(ipr, selected):
|
|||
('History', urlreverse('ipr_history', kwargs={ 'id': ipr.pk }))
|
||||
]]
|
||||
|
||||
@debug.trace
|
||||
def show(request, id):
|
||||
"""View of individual declaration"""
|
||||
ipr = get_object_or_404(IprDisclosureBase, id=id).get_child()
|
||||
|
@ -717,6 +719,7 @@ def show(request, id):
|
|||
return render(request, "ipr/details_view.html", {
|
||||
'ipr': ipr,
|
||||
'tabs': get_details_tabs(ipr, 'Disclosure'),
|
||||
'choices_abc': [ i.desc for i in IprLicenseTypeName.objects.filter(slug__in=['no-license', 'royalty-free', 'reasonable', ]) ],
|
||||
'updates_iprs': ipr.relatedipr_source_set.all(),
|
||||
'updated_by_iprs': ipr.relatedipr_target_set.filter(source__state="posted")
|
||||
})
|
||||
|
|
|
@ -200,9 +200,19 @@
|
|||
specification, is as follows(select one licensing declaration option only):
|
||||
</p>
|
||||
|
||||
{% if ipr.licensing.slug == "provided-later" %}
|
||||
<div>
|
||||
Possible licencing choices a), b), and c) when Licencing Declaration to be Provided Later:
|
||||
<ul style="list-style: none">
|
||||
{% for desc in choices_abc %}
|
||||
<li>{{ desc}}</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</p>
|
||||
{% endif %}
|
||||
<dl class="dl-horizontal">
|
||||
<dt>Licensing</dt>
|
||||
<dd>{% if ipr.licensing.slug == "later" %}{{ ipr.licensing.desc|slice:"2:"|slice:":43" }}{% else %}{{ ipr.licensing.desc|slice:"2:" }}{% endif %}</dd>
|
||||
<dd>{% if ipr.licensing.slug == "provided-later" %}{{ ipr.licensing.desc|slice:"2:"|slice:":117" }}){% else %}{{ ipr.licensing.desc|slice:"2:" }}{% endif %}</dd>
|
||||
|
||||
<dt>Licensing information, comments, notes, or URL for further information</dt>
|
||||
<dd>{{ ipr.licensing_comments|default:"(No information submitted)"|linebreaks }}</dd>
|
||||
|
|
Loading…
Reference in a new issue