Skip to content

Commit

Permalink
Merge pull request #2020 from bookwyrm-social/multi-input
Browse files Browse the repository at this point in the history 
Array input field for forms
  • Loading branch information
@mouse-reeve
mouse-reeve authored Mar 14, 2022
2 parents 916d6a4 + a37f83c commit 13b82c2
Show file tree
Hide file tree
Showing 3 changed files with 96 additions and 29 deletions.
12 changes: 9 additions & 3 deletions bookwyrm/forms/books.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ class Meta:
help_texts = {f: None for f in fields}


class ArrayWidget(forms.widgets.TextInput):
# pylint: disable=unused-argument
# pylint: disable=no-self-use
def value_from_datadict(self, data, files, name):
"""get all values for this name"""
return [i for i in data.getlist(name) if i]


class EditionForm(CustomForm):
class Meta:
model = models.Edition
Expand Down Expand Up @@ -41,12 +49,10 @@ class Meta:
"series_number": forms.TextInput(
attrs={"aria-describedby": "desc_series_number"}
),
"subjects": ArrayWidget(),
"languages": forms.TextInput(
attrs={"aria-describedby": "desc_languages_help desc_languages"}
),
"subjects": forms.TextInput(
attrs={"aria-describedby": "desc_subjects_help desc_subjects"}
),
"publishers": forms.TextInput(
attrs={"aria-describedby": "desc_publishers_help desc_publishers"}
),
Expand Down
17 changes: 17 additions & 0 deletions bookwyrm/static/js/forms.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
(function () {
"use strict";

/**
* Remoev input field
*
* @param {event} the button click event
*/
function removeInput(event) {
const trigger = event.currentTarget;
const input_id = trigger.dataset.remove;
const input = document.getElementById(input_id);

input.remove();
}

/**
* Duplicate an input field
*
Expand Down Expand Up @@ -29,4 +42,8 @@
document
.querySelectorAll("[data-duplicate]")
.forEach((node) => node.addEventListener("click", duplicateInput));

document
.querySelectorAll("[data-remove]")
.forEach((node) => node.addEventListener("click", removeInput));
})();
96 changes: 70 additions & 26 deletions bookwyrm/templates/book/edit/edit_book_form.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ <h2 class="title is-4">
{% trans "Title:" %}
</label>
<input type="text" name="title" value="{{ form.title.value|default:'' }}" maxlength="255" class="input" required="" id="id_title" aria-describedby="desc_title">

{% include 'snippets/form_errors.html' with errors_list=form.title.errors id="desc_title" %}
</div>

Expand All @@ -31,7 +31,7 @@ <h2 class="title is-4">
{% trans "Subtitle:" %}
</label>
<input type="text" name="subtitle" value="{{ form.subtitle.value|default:'' }}" maxlength="255" class="input" id="id_subtitle" aria-describedby="desc_subtitle">

{% include 'snippets/form_errors.html' with errors_list=form.subtitle.errors id="desc_subtitle" %}
</div>

Expand All @@ -40,7 +40,7 @@ <h2 class="title is-4">
{% trans "Description:" %}
</label>
{{ form.description }}

{% include 'snippets/form_errors.html' with errors_list=form.description.errors id="desc_description" %}
</div>

Expand All @@ -51,7 +51,7 @@ <h2 class="title is-4">
{% trans "Series:" %}
</label>
<input type="text" class="input" name="series" id="id_series" value="{{ form.series.value|default:'' }}" aria-describedby="desc_series">

{% include 'snippets/form_errors.html' with errors_list=form.series.errors id="desc_series" %}
</div>
</div>
Expand All @@ -61,7 +61,7 @@ <h2 class="title is-4">
{% trans "Series number:" %}
</label>
{{ form.series_number }}

{% include 'snippets/form_errors.html' with errors_list=form.series_number.errors id="desc_series_number" %}
</div>
</div>
Expand All @@ -75,21 +75,60 @@ <h2 class="title is-4">
<span class="help" id="desc_languages_help">
{% trans "Separate multiple values with commas." %}
</span>

{% include 'snippets/form_errors.html' with errors_list=form.languages.errors id="desc_languages" %}
</div>

<div class="field">
<label class="label" for="id_subjects">
<div>
<label class="label" for="id_add_subjects">
{% trans "Subjects:" %}
</label>
{{ form.subjects }}
<span class="help" id="desc_subjects_help">
{% trans "Separate multiple values with commas." %}
</span>
{% for subject in book.subjects %}
<label class="label is-sr-only" for="id_add_subject={% if not forloop.first %}-{{forloop.counter}}{% endif %}">
{% trans "Add subject" %}
</label>
<div class="field has-addons" id="subject_field_wrapper_{{ forloop.counter }}">
<div class="control is-expanded">
<input
id="id_add_subject-{{ forloop.counter }}"
type="text"
name="subjects"
value="{{ subject }}"
class="input"
>
</div>
<div class="control">
<button
class="button is-danger is-light"
type="button"
data-remove="subject_field_wrapper_{{ forloop.counter }}"
>
{% trans "Remove subject" as text %}
<span class="icon icon-x" title="{{ text }}">
<span class="is-sr-only">{{ text }}</span>
</span>
</button>
</div>
</div>
{% endfor %}
<input
class="input"
type="text"
name="subjects"
id="id_add_subject"
value="{{ subject }}"
{% if confirm_mode %}readonly{% endif %}
>

{% include 'snippets/form_errors.html' with errors_list=form.subjects.errors id="desc_subjects" %}
</div>

<span class="help">
<button class="button is-small" type="button" data-duplicate="id_add_subject" id="another_subject_field">
<span class="icon icon-plus" aria-hidden="true"></span>
<span>{% trans "Add Another Subject" %}</span>
</button>
</span>
</div>
</section>

Expand All @@ -106,7 +145,7 @@ <h2 class="title is-4">
<span class="help" id="desc_publishers_help">
{% trans "Separate multiple values with commas." %}
</span>

{% include 'snippets/form_errors.html' with errors_list=form.publishers.errors id="desc_publishers" %}
</div>

Expand All @@ -115,7 +154,7 @@ <h2 class="title is-4">
{% trans "First published date:" %}
</label>
<input type="date" name="first_published_date" class="input" id="id_first_published_date"{% if form.first_published_date.value %} value="{{ form.first_published_date.value|date:'Y-m-d' }}"{% endif %} aria-describedby="desc_first_published_date">

{% include 'snippets/form_errors.html' with errors_list=form.first_published_date.errors id="desc_first_published_date" %}
</div>

Expand All @@ -124,7 +163,7 @@ <h2 class="title is-4">
{% trans "Published date:" %}
</label>
<input type="date" name="published_date" class="input" id="id_published_date"{% if form.published_date.value %} value="{{ form.published_date.value|date:'Y-m-d'}}"{% endif %} aria-describedby="desc_published_date">

{% include 'snippets/form_errors.html' with errors_list=form.published_date.errors id="desc_published_date" %}
</div>
</div>
Expand Down Expand Up @@ -162,7 +201,12 @@ <h2 class="title is-4">
<input class="input" type="text" name="add_author" id="id_add_author" placeholder="{% trans 'Jane Doe' %}" value="{{ author }}" {% if confirm_mode %}readonly{% endif %}>
{% endfor %}
</div>
<span class="help"><button class="button is-small" type="button" data-duplicate="id_add_author" id="another_author_field">{% trans "Add Another Author" %}</button></span>
<span class="help">
<button class="button is-small" type="button" data-duplicate="id_add_author" id="another_author_field">
<span class="icon icon-plus" aria-hidden="true"></span>
<span>{% trans "Add Another Author" %}</span>
</button>
</span>
</div>
</section>
</div>
Expand Down Expand Up @@ -193,7 +237,7 @@ <h2 class="title is-4">
</label>
<input class="input" name="cover-url" id="id_cover_url" type="url" value="{{ cover_url|default:'' }}" aria-describedby="desc_cover">
</div>

{% include 'snippets/form_errors.html' with errors_list=form.cover.errors id="desc_cover" %}
</div>
</div>
Expand All @@ -214,7 +258,7 @@ <h2 class="title is-4">
<div class="select">
{{ form.physical_format }}
</div>

{% include 'snippets/form_errors.html' with errors_list=form.physical_format.errors id="desc_physical_format" %}
</div>
</div>
Expand All @@ -224,7 +268,7 @@ <h2 class="title is-4">
{% trans "Format details:" %}
</label>
{{ form.physical_format_detail }}

{% include 'snippets/form_errors.html' with errors_list=form.physical_format_detail.errors id="desc_physical_format_detail" %}
</div>
</div>
Expand All @@ -235,7 +279,7 @@ <h2 class="title is-4">
{% trans "Pages:" %}
</label>
{{ form.pages }}

{% include 'snippets/form_errors.html' with errors_list=form.pages.errors id="desc_pages" %}
</div>
</div>
Expand All @@ -251,7 +295,7 @@ <h2 class="title is-4">
{% trans "ISBN 13:" %}
</label>
{{ form.isbn_13 }}

{% include 'snippets/form_errors.html' with errors_list=form.isbn_13.errors id="desc_isbn_13" %}
</div>

Expand All @@ -260,7 +304,7 @@ <h2 class="title is-4">
{% trans "ISBN 10:" %}
</label>
{{ form.isbn_10 }}

{% include 'snippets/form_errors.html' with errors_list=form.isbn_10.errors id="desc_isbn_10" %}
</div>

Expand All @@ -269,7 +313,7 @@ <h2 class="title is-4">
{% trans "Openlibrary ID:" %}
</label>
{{ form.openlibrary_key }}

{% include 'snippets/form_errors.html' with errors_list=form.openlibrary_key.errors id="desc_openlibrary_key" %}
</div>

Expand All @@ -278,7 +322,7 @@ <h2 class="title is-4">
{% trans "Inventaire ID:" %}
</label>
{{ form.inventaire_id }}

{% include 'snippets/form_errors.html' with errors_list=form.inventaire_id.errors id="desc_inventaire_id" %}
</div>

Expand All @@ -287,7 +331,7 @@ <h2 class="title is-4">
{% trans "OCLC Number:" %}
</label>
{{ form.oclc_number }}

{% include 'snippets/form_errors.html' with errors_list=form.oclc_number.errors id="desc_oclc_number" %}
</div>

Expand All @@ -296,7 +340,7 @@ <h2 class="title is-4">
{% trans "ASIN:" %}
</label>
{{ form.asin }}

{% include 'snippets/form_errors.html' with errors_list=form.ASIN.errors id="desc_ASIN" %}
</div>
</div>
Expand Down

0 comments on commit 13b82c2

Please sign in to comment.