From 6d17b83c8ca2bdd76c7d4b109c45dec684bb7678 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 29 Sep 2021 15:35:08 -0700
Subject: [PATCH] Id uniqueness fixes

---
 bookwyrm/templates/snippets/create_status/content_field.html  | 2 +-
 bookwyrm/templates/snippets/create_status/layout.html         | 4 ++--
 .../snippets/reading_modals/finish_reading_modal.html         | 4 ++++
 bookwyrm/templates/snippets/reading_modals/layout.html        | 3 +--
 .../snippets/reading_modals/progress_update_modal.html        | 4 ++++
 .../snippets/reading_modals/start_reading_modal.html          | 4 ++++
 .../templates/snippets/reading_modals/want_to_read_modal.html | 4 ++++
 bookwyrm/templates/snippets/toggle/toggle_button.html         | 2 +-
 8 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/templates/snippets/create_status/content_field.html b/bookwyrm/templates/snippets/create_status/content_field.html
index c2b383b9a..c9afecc71 100644
--- a/bookwyrm/templates/snippets/create_status/content_field.html
+++ b/bookwyrm/templates/snippets/create_status/content_field.html
@@ -12,7 +12,7 @@ draft: an existing Status object that is providing default values for input fiel
     name="content"
     class="textarea save-draft"
     data-cache-draft="id_content_{{ type }}_{{ book.id }}{{ reply_parent.id }}"
-    id="id_content_{{ type }}_{{ book.id }}{{ reply_parent.id }}"
+    id="id_content_{{ type }}_{{ book.id }}{{ reply_parent.id }}{{ uuid }}"
     placeholder="{{ placeholder }}"
     aria-label="{% if reply_parent %}{% trans 'Reply' %}{% else %}{% trans 'Content' %}{% endif %}"
     {% if not optional and type != "quotation" and type != "review" %}required{% endif %}
diff --git a/bookwyrm/templates/snippets/create_status/layout.html b/bookwyrm/templates/snippets/create_status/layout.html
index 1e10085c0..4dded2005 100644
--- a/bookwyrm/templates/snippets/create_status/layout.html
+++ b/bookwyrm/templates/snippets/create_status/layout.html
@@ -19,7 +19,7 @@ reply_parent: the Status object this post will be in reply to, if applicable
     name="{{ type }}"
     action="/post/{{ type }}"
     method="post"
-    id="tab_{{ type }}_{{ book.id }}{{ reply_parent.id }}"
+    id="form_{{ type }}_{{ book.id }}{{ reply_parent.id }}"
 >
 {% endblock %}
 
@@ -36,7 +36,7 @@ reply_parent: the Status object this post will be in reply to, if applicable
     {# fields that go between the content warnings and the content field (ie, quote) #}
     {% block pre_content_additions %}{% endblock %}
 
-    <label class="label" for="id_content_{{ type }}_{{ book.id }}{{ reply_parent.id }}">
+    <label class="label" for="id_content_{{ type }}_{{ book.id }}{{ reply_parent.id }}{{ uuid }}">
         {% block content_label %}
             {% trans "Comment:" %}
         {% endblock %}
diff --git a/bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html b/bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html
index 96e4da9b6..3c1271600 100644
--- a/bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html
+++ b/bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html
@@ -35,3 +35,7 @@ Finish "<em>{{ book_title }}</em>"
     </div>
 </div>
 {% endblock %}
+
+{% block form %}
+{% include "snippets/reading_modals/form.html" with optional=True type="finish_modal" %}
+{% endblock %}
diff --git a/bookwyrm/templates/snippets/reading_modals/layout.html b/bookwyrm/templates/snippets/reading_modals/layout.html
index 9b922aa60..89cc9a2e4 100644
--- a/bookwyrm/templates/snippets/reading_modals/layout.html
+++ b/bookwyrm/templates/snippets/reading_modals/layout.html
@@ -23,8 +23,7 @@
 <div id="reading_content_{{ local_uuid }}_{{ uuid }}">
     <hr aria-hidden="true">
     <fieldset id="reading_content_fieldset_{{ local_uuid }}_{{ uuid }}">
-        {% comparison_bool controls_text "progress_update" True as optional %}
-        {% include "snippets/reading_modals/form.html" with optional=optional %}
+        {% block form %}{% endblock %}
     </fieldset>
 </div>
 {% endwith %}
diff --git a/bookwyrm/templates/snippets/reading_modals/progress_update_modal.html b/bookwyrm/templates/snippets/reading_modals/progress_update_modal.html
index 713dad8d4..df02d0b44 100644
--- a/bookwyrm/templates/snippets/reading_modals/progress_update_modal.html
+++ b/bookwyrm/templates/snippets/reading_modals/progress_update_modal.html
@@ -15,3 +15,7 @@
 <label for="id_progress_{{ readthrough.id }}" class="label">{% trans "Progress:" %}</label>
 {% include "snippets/progress_field.html" with progress_required=True %}
 {% endblock %}
+
+{% block form %}
+{% include "snippets/reading_modals/form.html" with optional=False type="update_modal" %}
+{% endblock %}
diff --git a/bookwyrm/templates/snippets/reading_modals/start_reading_modal.html b/bookwyrm/templates/snippets/reading_modals/start_reading_modal.html
index 827c0a86d..cd0b64f3b 100644
--- a/bookwyrm/templates/snippets/reading_modals/start_reading_modal.html
+++ b/bookwyrm/templates/snippets/reading_modals/start_reading_modal.html
@@ -22,3 +22,7 @@ Start "<em>{{ book_title }}</em>"
     <input type="date" name="start_date" class="input" id="start_id_start_date_{{ uuid }}" value="{% now "Y-m-d" %}">
 </div>
 {% endblock %}
+
+{% block form %}
+{% include "snippets/reading_modals/form.html" with optional=True type="start_modal" %}
+{% endblock %}
diff --git a/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html b/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html
index 5dec637be..d1f06d8f1 100644
--- a/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html
+++ b/bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html
@@ -13,3 +13,7 @@ Want to Read "<em>{{ book_title }}</em>"
 <input type="hidden" name="reading_status" value="to-read">
 {% csrf_token %}
 {% endblock %}
+
+{% block form %}
+{% include "snippets/reading_modals/form.html" with optional=True type="want_modal" %}
+{% endblock %}
diff --git a/bookwyrm/templates/snippets/toggle/toggle_button.html b/bookwyrm/templates/snippets/toggle/toggle_button.html
index 56dda6f7a..0f8e01655 100644
--- a/bookwyrm/templates/snippets/toggle/toggle_button.html
+++ b/bookwyrm/templates/snippets/toggle/toggle_button.html
@@ -1,5 +1,5 @@
 {% if fallback_url %}
-<form name="fallback-form-{{ controls_uid }}" method="GET" action="{{ fallback_url }}">
+<form name="fallback_form_{{ controls_text }}{{ controls_uid }}" method="GET" action="{{ fallback_url }}">
 {% endif %}
 <button
     {% if not fallback_url %}