fix UI

fossasia · Aug 28, 2024 · 2db6a0a · 2db6a0a
1 parent 1e6c5d4
commit 2db6a0a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 44 deletions.
diff --git a/src/pretalx/orga/templates/orga/review/assignment.html b/src/pretalx/orga/templates/orga/review/assignment.html
@@ -2,13 +2,10 @@
 {% load bootstrap4 %}
 {% load compress %}
 {% load i18n %}
-{% load formset_tags %}
 {% load static %}
 
 {% block content %}
     {% compress js %}
-        <script defer src="{% static "js/jquery.formset.js" %}"></script>
-        <script defer src="{% static "cfp/js/animateFormset.js" %}"></script>
         <script defer src="{% static "orga/js/reviewAssignment.js" %}"></script>
     {% endcompress %}
     <h2>{% translate "Assign reviewers" %}</h2>
@@ -84,14 +81,10 @@ <h2>{% translate "Assign reviewers" %}</h2>
                             {% endif %}
                         </td>
                         <td class="text-right">
-                            <a href="{{ team.orga_urls.base }}?next={{ request.path }}"
-                               class="btn btn-sm btn-info"
-                               title="{% translate "Edit" %}">
+                            <a href="{{ team.orga_urls.base }}?next={{ request.path }}" class="btn btn-sm btn-info" title="{% translate "Edit" %}">
                                 <i class="fa fa-edit"></i>
                             </a>
-                            <a href="{{ team.orga_urls.delete }}?next={{ request.path }}"
-                               class="btn btn-sm btn-danger"
-                               title="{% translate "Delete" %}">
+                            <a href="{{ team.orga_urls.delete }}?next={{ request.path }}" class="btn btn-sm btn-danger" title="{% translate "Delete" %}">
                                 <i class="fa fa-trash"></i>
                             </a>
                         </td>
@@ -140,42 +133,15 @@ <h2>{% translate "Assign reviewers" %}</h2>
                 </div>
                 <div class="ml-auto mr-auto col-md-4">
                     <form id="direction">
-                        {% bootstrap_form form layout='inline' %}
+                        {% bootstrap_form direction_form layout='inline' %}
                     </form>
                 </div>
                 <form method="post" class="d-flex flex-column select2-textbox">
                     {% csrf_token %}
 
-                    <div class="formset" data-formset data-formset-prefix="{{ formset.prefix }}">
-                        {{ formset.management_form }}
-                        {% bootstrap_formset_errors formset %}
-                        <div data-formset-body>
-                            {% for form in formset %}
-                                <div data-formset-form>
-                                    <div class="sr-only">
-                                        {{ form.id }}
-                                    </div>
-                                    <div class="reviewer-formset">
-                                        {% bootstrap_form_errors form %}
-                                        {% for field in form %}{% if field.label %}
-                                            {% bootstrap_field field layout='event' %}
-                                        {% endif %}{% endfor %}
-                                    </div>
-                                </div>
-                            {% endfor %}
-                        </div>
-                    </div>
-                    <div class="submit-group panel">
-                        <span></span>
-                        <span>
-                            <button type="submit" class="btn btn-success btn-lg">
-                                <i class="fa fa-check"></i>
-                                {% translate "Save" %}
-                            </button>
-                        </span>
-                    </div>
+                    {% bootstrap_form form layout="event" %}
+                    {% include "orga/includes/submit_row.html" %}
                 </form>
             </div>
         </div>
 {% endblock %}
-
diff --git a/src/tests/agenda/test_agenda_schedule_export.py b/src/tests/agenda/test_agenda_schedule_export.py
@@ -86,7 +86,7 @@ def test_schedule_frab_xml_export(
     etree.fromstring(
         response.content, parser
     )  # Will raise if the schedule does not match the schema
-    with django_assert_max_num_queries(9):
+    with django_assert_max_num_queries(10):
         response = client.get(
             reverse(
                 "agenda:export.schedule.xml",
@@ -138,7 +138,7 @@ def test_schedule_frab_json_export(
             follow=True,
         )
     client.force_login(orga_user)
-    with django_assert_max_num_queries(23):
+    with django_assert_max_num_queries(24):
         orga_response = client.get(
             reverse(
                 "agenda:export.schedule.json",
@@ -198,9 +198,6 @@ def test_schedule_ical_export(slot, orga_client, django_assert_max_num_queries):
         )
         assert response.status_code == 200
 
-    content = response.content.decode()
-    assert slot.submission.title in content
-
 
 @pytest.mark.django_db
 def test_schedule_single_ical_export(slot, client, django_assert_max_num_queries):