Skip to content

fix: Allow additional draft forms to be added to IPR disclosure edit form #4952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjsparks merged 3 commits into from
Jan 6, 2023
Merged

fix: Allow additional draft forms to be added to IPR disclosure edit form #4952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d97c41
chore: Remove commented-out template content
jennifer-richards Jan 6, 2023
fada60c
fix: Correctly number newly added draft_form inputs on IPR edit form
jennifer-richards Jan 6, 2023
809dda1
fix: Initialize select2 when adding a new field instance
jennifer-richards Jan 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ietf/ipr/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ def edit(request, id, updates=None):
ipr = get_object_or_404(IprDisclosureBase, id=id).get_child()
type = class_to_type[ipr.__class__.__name__]

DraftFormset = inlineformset_factory(IprDisclosureBase, IprDocRel, form=DraftForm, can_delete=True, extra=1)
DraftFormset = inlineformset_factory(IprDisclosureBase, IprDocRel, form=DraftForm, can_delete=True, extra=0)

if request.method == 'POST':
form = ipr_form_mapping[ipr.__class__.__name__](request.POST,instance=ipr)
Expand All @@ -316,7 +316,7 @@ def edit(request, id, updates=None):
else:
valid_formsets = True

if form.is_valid() and valid_formsets:
if form.is_valid() and valid_formsets:
updates = form.cleaned_data.get('updates')
disclosure = form.save(commit=False)
disclosure.save()
Expand Down
4 changes: 3 additions & 1 deletion ietf/static/js/ipr-edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $(document)
["for", "id", "name"].forEach(function (at) {
var val = x.attr(at);
if (val && val.match("iprdocrel")) {
x.attr(at, val.replace('-1-', '-' + total + '-'));
x.attr(at, val.replace('__prefix__', total.toString()));
}
});
});
Expand All @@ -27,6 +27,8 @@ $(document)
totalField.val(total);

template.before(el);

el.find('.select2-field').each((index, element) => setupSelect2Field($(element)));
});

function updateRevisions() {
Expand Down
34 changes: 5 additions & 29 deletions ietf/templates/ipr/details_edit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,37 +131,13 @@ <h2 class="mt-4">{% cycle section %}. IETF document or other contribution to whi
</p>
{{ draft_formset.management_form }}
{% for draft_form in draft_formset %}
<div class="row draft-row {% if forloop.last %}template d-none{% endif %}">
<label class="col-md-2 fw-bold" for="{{ draft_form.document.id_for_label }}">{{ draft_form.document.label }}</label>
<div class="col-md-6">
{{ draft_form.id }}
{{ draft_form.document }}
{% if draft_form.document.errors %}<div class="alert alert-danger my-3">{{ draft_form.document.errors }}</div>{% endif %}
</div>
<div class="col-md-2">
{% bootstrap_field draft_form.revisions class="form-control" placeholder="Revisions, e.g., 04-07" show_help=False show_label=False %}
<label class="d-none" for="{{ draft_form.revisions.id_for_label }}">{{ draft_form.revisions.label }}</label>
</div>
<div class="col-md-2">
{% bootstrap_field draft_form.sections class="form-control" placeholder="Sections" show_help=False show_label=False %}
<label class="d-none" for="{{ draft_form.sections.id_for_label }}">{{ draft_form.sections.label }}</label>
</div>
<div class="row draft-row">
{% include "ipr/details_edit_draft.html" with draft_form=draft_form only %}
</div>
{% endfor %}
{% comment %}
{% for draft_form in draft_formset %}
<div class="row draft-row {% if forloop.last %}template{% endif %}">
<div class="col-md-2 fw-bold">{% bootstrap_label draft_form.document.label %}</div>
<div class="col-md-6">{% bootstrap_field draft_form.document label_class="d-none" show_help=False %}</div>
<div class="col-md-2">
{% bootstrap_field draft_form.revisions placeholder="Revisions, e.g., 04-07" label_class="d-none" show_help=False %}
</div>
<div class="col-md-2">
{% bootstrap_field draft_form.sections placeholder="Sections" label_class="d-none" show_help=False %}
</div>
</div>
{% endfor %}
{% endcomment %}
<div class="row draft-row template d-none">
{% include "ipr/details_edit_draft.html" with draft_form=draft_formset.empty_form only %}
</div>
<div class="mb-3 row">
<div class="col-md-2"></div>
<div class="col-md-10">
Expand Down
14 changes: 14 additions & 0 deletions ietf/templates/ipr/details_edit_draft.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{% load django_bootstrap5 %}<label class="col-md-2 fw-bold" for="{{ draft_form.document.id_for_label }}">{{ draft_form.document.label }}</label>
<div class="col-md-6">
{{ draft_form.id }}
{{ draft_form.document }}
{% if draft_form.document.errors %}<div class="alert alert-danger my-3">{{ draft_form.document.errors }}</div>{% endif %}
</div>
<div class="col-md-2">
{% bootstrap_field draft_form.revisions class="form-control" placeholder="Revisions, e.g., 04-07" show_help=False show_label=False %}
<label class="d-none" for="{{ draft_form.revisions.id_for_label }}">{{ draft_form.revisions.label }}</label>
</div>
<div class="col-md-2">
{% bootstrap_field draft_form.sections class="form-control" placeholder="Sections" show_help=False show_label=False %}
<label class="d-none" for="{{ draft_form.sections.id_for_label }}">{{ draft_form.sections.label }}</label>
</div>