Veranstaltung löschen ohne Eingabe #326

cypress/integration/event.js

@@ -110,7 +110,6 @@ describe("Event", () => {
     cy.createAdminUnit().then(function (adminUnitId) {
       cy.createEvent(adminUnitId).then(function (eventId) {
         cy.visit("/event/" + eventId + "/delete");
-        cy.get("#name").type("Name");
         cy.screenshot("delete");
         cy.get("#submit").click();
         cy.url().should(

project/forms/event.py

@@ -395,7 +395,6 @@ class UpdateEventForm(BaseEventForm):
 
 class DeleteEventForm(FlaskForm):
     submit = SubmitField(lazy_gettext("Delete event"))
-    name = StringField(lazy_gettext("Name"), validators=[DataRequired()])
 
 
 class FindEventForm(FlaskForm):

project/templates/event/delete.html

@@ -7,18 +7,7 @@
 
 <form action="{{ url_for('event_delete', event_id=event.id) }}" method="POST">
   {{ form.hidden_tag() }}
-
-  <div class="card mb-4">
-    <div class="card-header">
-      {{ _('Event') }}
-    </div>
-    <div class="card-body">
-      {{ render_field_with_errors(form.name) }}
-    </div>
-  </div>
-
   {{ render_field(form.submit) }}
-
 </form>
 
 {% endblock %}

project/views/event.py

@@ -45,7 +45,6 @@ from project.views.utils import (
     flash_message,
     get_share_links,
     handleSqlError,
-    non_match_for_deletion,
     send_mails,
 )
 
@@ -242,18 +241,15 @@ def event_delete(event_id):
     form = DeleteEventForm()
 
     if form.validate_on_submit():
-        if non_match_for_deletion(form.name.data, event.name):
-            flash(gettext("Entered name does not match event name"), "danger")
-        else:
-            try:
-                admin_unit_id = event.admin_unit.id
-                db.session.delete(event)
-                db.session.commit()
-                flash(gettext("Event successfully deleted"), "success")
-                return redirect(url_for("manage_admin_unit_events", id=admin_unit_id))
-            except SQLAlchemyError as e:
-                db.session.rollback()
-                flash(handleSqlError(e), "danger")
+        try:
+            admin_unit_id = event.admin_unit.id
+            db.session.delete(event)
+            db.session.commit()
+            flash(gettext("Event successfully deleted"), "success")
+            return redirect(url_for("manage_admin_unit_events", id=admin_unit_id))
+        except SQLAlchemyError as e:
+            db.session.rollback()
+            flash(handleSqlError(e), "danger")
     else:
         flash_errors(form)
 

tests/views/test_event.py

@@ -564,9 +564,7 @@ def test_delete(client, seeder, utils, app, mocker, db_error):
     response = utils.post_form(
         url,
         response,
-        {
-            "name": "Name",
-        },
+        {},
     )
 
     if db_error:
@@ -588,26 +586,6 @@ def test_delete(client, seeder, utils, app, mocker, db_error):
         assert event is None
 
 
-def test_delete_nameDoesNotMatch(client, seeder, utils, app, mocker):
-    user_id, admin_unit_id = seeder.setup_base()
-    event_id = seeder.create_event(admin_unit_id)
-
-    url = utils.get_url("event_delete", event_id=event_id)
-    response = utils.get_ok(url)
-
-    response = utils.post_form(
-        url,
-        response,
-        {
-            "name": "Falscher Name",
-        },
-    )
-
-    utils.assert_response_error_message(
-        response, b"Der eingegebene Name entspricht nicht dem Namen der Veranstaltung"
-    )
-
-
 def test_rrule(client, seeder, utils, app):
     url = utils.get_url("event_rrule")
     response = utils.post_json(