From 60f9e3f382a88f5c848aa8027f8fc865959315d0 Mon Sep 17 00:00:00 2001 From: Daniel Grams Date: Sun, 4 Oct 2020 13:32:32 +0200 Subject: [PATCH] =?UTF-8?q?Ort=20l=C3=B6schen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- forms/event_place.py | 4 +++ templates/event_place/delete.html | 24 ++++++++++++++++++ templates/manage/places.html | 1 + translations/de/LC_MESSAGES/messages.mo | Bin 13946 -> 14170 bytes translations/de/LC_MESSAGES/messages.po | 32 ++++++++++++++++-------- views/event_place.py | 30 +++++++++++++++++++++- 6 files changed, 80 insertions(+), 11 deletions(-) create mode 100644 templates/event_place/delete.html diff --git a/forms/event_place.py b/forms/event_place.py index 9a6139d..81b820b 100644 --- a/forms/event_place.py +++ b/forms/event_place.py @@ -37,6 +37,10 @@ class UpdateEventPlaceForm(BaseEventPlaceForm): public = BooleanField(lazy_gettext('Other organizers can use this location'), validators=[Optional()]) submit = SubmitField(lazy_gettext("Update place")) +class DeleteEventPlaceForm(FlaskForm): + submit = SubmitField(lazy_gettext("Delete place")) + name = StringField(lazy_gettext('Name'), validators=[DataRequired()]) + class FindEventPlaceForm(FlaskForm): class Meta: csrf = False diff --git a/templates/event_place/delete.html b/templates/event_place/delete.html new file mode 100644 index 0000000..3b6b2d1 --- /dev/null +++ b/templates/event_place/delete.html @@ -0,0 +1,24 @@ +{% extends "layout.html" %} +{% from "_macros.html" import render_field_with_errors, render_field %} + +{% block content %} + +

{{ _('Delete place') }} "{{ place.name }}"

+ +
+ {{ form.hidden_tag() }} + +
+
+ {{ _('Place') }} +
+
+ {{ render_field_with_errors(form.name) }} +
+
+ + {{ render_field(form.submit) }} + +
+ +{% endblock %} diff --git a/templates/manage/places.html b/templates/manage/places.html index 87e2155..c5446fb 100644 --- a/templates/manage/places.html +++ b/templates/manage/places.html @@ -32,6 +32,7 @@
{{ _('Edit') }} + {{ _('Delete') }}...
diff --git a/translations/de/LC_MESSAGES/messages.mo b/translations/de/LC_MESSAGES/messages.mo index 9505780bc762af87d33aaff15c0a764acfd0071e..75b385e457071f0a6cad2e4807276950d7698755 100644 GIT binary patch delta 3956 zcmYM#du*508Nl&VT4*VSaw`s6ZMj(5LIJr{1v@SiCNU1?1_Ij@!f2UvS{ce(cFq5*cHo9DmiMCI%> zOZQnc^|R4T%tJG=1T9q~nyGKc^#{W54@p_{TEt@&(pZ_Gu<|3W4jOX5ZYy6aa(e+@eDIy3_hB2`E~iu)bt zijQCgz8L-;%~Zi>vZbg(C!CE2_QmLD7SS-mucH$+p#iKzBi$1H7IahYjQ-)c|2#V2 zuh9~`68)3mTWH|#gozF3d}YY^nKX)qHL6C+nxJ`_HQX5cs) z;2Y?K7tu@&VaIt|YQhO&9S-yS-_YIQyoRgM741L+*o|i72k3xLqAPe7yH}3xjaR}y zBR}bVesR)LKG7KXu<-hD5f(CkT1$hYp0=Qw*o|Z>{S;l%bLeq88}^`MsmjrT$D*6? zW_0r{K?7WguDm(!--o`p6bmAX|t!SnWh3&}xOh>LH|8BB3xL{O~#r_ry?@F$Ep(o&p-o3ICV;*K27GrE#5kIer0 zZ9r4K5?$GM&{{r(mhe$@^F0;!k0D>-bP|2~3}^tjy}t_$x+ zBj15;%A;6~U3fM2<(Dg-glwBM4XyDabTc=jncRjwaUYV&OgfNlq=U%UH2oZn^fr>ED%nENoCtid-@gDTOwU~$B!-1avoiwiJ!jHqZa3=jL z$dfKc?>~+Pasu5v?_oZEg1s=OD!bwWGy@grU%z@J+i7X|05U~7hy$5Fy+*@<&Y%OG z!vg#mEy+c+*1gELr71yIS|0rx^ts9Cdo!XxH|{S$pT8secgFoSnDK>8G)(n2^ufo` z6+VFm){d^|C~_jxAHoZ0z$G==6qjLd`XkWmW1~L_O?f?9idpEmH`S1T1DGEd7Goj( zW#|h{*j>ADEjqyl^u3mFXWZY14txOJY^`zsFy_*K9u4dTbg#W!L;g+OnRwtsbmD)Y zo9Y4gKYUFrkQY{Vs zRHr%UCR>U=xB;Db3p&8V=<$0Dt>Gbb}@pQ zkFmt_pT{f?Gz^_^3cvbdBU;0I@kZQ;mZ}r`;c4^>cRuVrF}vas=)`qsAobC|3C-j@ zG*h=>#s}`Eq3h8aZ$-+NT5%elz!^AT66wcVaXOyE&tuKx>|R-orhFrsp+};BFg%L> zb^INg@%JZ_e^;J6C7YV7&=pOTdD}EQ9;5@q0A_ifu zG#F>$T&%(Ecr6~TV>Zw0M_ibL#awlFF1)twrGCSE^lWZgwtPifSO1EfU8e?=M)%Ty z!h&7(LkrseIrK<=-lVA$uWS3o@Yi#5=dE7Tw*KlpIlEr1oSa8zMO)v|_xCDjT+!6o O@vY@6+cwr-D)=9rq=ioa delta 3869 zcmYM$32anV6vpveTH5K}0%a*nhqe^DQ=kxvmQpK%fgmWYC>R8!G+_%NR0;8ch!_D$ zAnc2cVR1o0Mzjxoe@7{CIx$g}ZWuKSHhl|LWtMOQLxSL+}c=$7{&P{mEB2`r?D<y+u zg`+S9E3k)io~z~{mJ{o(!w%%*YWecvVGP5Q$PMlk`tcU_#MlJqx??^n_R*M#<1q#+ zk&l~i?PaL()?ftlyA2#@1@BphU8n&9sKAaPA9vckidy+S)XKu>9El02fs;`yO+jTK z3zf0H7>Z>`>}~|+GQWGCgG_u2GjJbfVIwAEn|8s0x}zpcLrsv6T451(#ivmHr<$*$ zGPB9rb=ZY=1FHWm^mK!d@bWMXb8sByqlf*l7JK7mRA5mZf)=7mG8wgZJWR!{*a;7# z#&0z5qV`fOU%H-_ME-SRh@BXVYFF{42tCwh*@Bwr5UNxcP$_RhW#T3(6ZcW23S|c> zQyoy}{bnwzbVaDrj_gSO)uDnDx?!3*7geK0)?R7tji>=WK;2h|8t5o0um;p7Jddh% z6KYRfLyg~T-na8@Jo2Dj9)aqZfEqXnm4Q?w>#o?Yk3+4v0{u9}T#Cxn4pb?Qq9$xY z1@^18f5+A*ymN3K&&PoRNJ0hB!`f-6&6s2DXYKk#)POIeN-)FP^UT*!fiE_r#-EyTRB8$DpSbzsi9kT!KZo61CD3W+N&i*HJ6|%i3|gT{Lm3*$0)WJhKqlZ|*Tv z?Vm#hHUTx>^zP(eFPep%D8P^K3A~79=x5o(@D)_Q-KfACQ7OERO6dbsW}LWm7L-INz+|NrTPYHWq+e;8J!laVJBoi zxm?us5y;!sRiN&hiM`RoY}}2?z-iPtS5Z%ycgGGMnqe$ok;kDn<>Q!%)36u5i(2t# z$To0aplW;`d174)Dw9!k*4{`)WzuhEA}>GJ4++$BBRSB@C!%)eY*Y>3L`A$2Rm%@i zCHUMtf|{@%+u}9UeK#=-AE7c4#wrG5Cvz+gqrIY4kN;3`po!zjmo`f;)C&7!I1WLr zuoSi87m#YWY9wiHv-u@5l)H?YIFe^90=uEcNk?TO8&!e<7{~msgag%L3~GfFtUV3Y zaW?vJp|zKy`maXy-(>9_c6~4UIDZh8*{@Ok&Y%|f3o5YN=xIgwIpB$N?J2Y@Kt((T zmD+NQ#EEu(y0vGaQeBPew+J=x8|cG#ti2W$z!p^hU8w#aXHtJ1e9DPPtV7*+#QX+z z{WNOe^Qg_$WY=3Tl=eeZ!2hB)SKF*$=DMM-_d!jZgW5|47=^`I-#MsKl%O9cn@g~D0@NO;MeUX2NR`}KEWnWb;G3~OX6yI= zMGo}*FGsynw_!XUFi)aVe-0Js6;w@|QIFRnRKSU(N#mrW#wkKgI38nhIjVH)unf0j zcjk9jIEcd#dMkAaW+rOIrPx|KR3MYAJp+}>IjBrk+x6AvW>jf+B1v>7a0uSR5-jLP z{WowhkAtBY)t?_Cd>XY$)}R8|j#}A%Yo9bPqJ9PMpi&+)Ah_~0Or%|mTF^5%5UWsu z)?hjw7~m>fC;EvKO3e+_KzC6qjw}pLkbqig4syv2z*4M2)pidK!ba5Ih-bFpn2*|& z3kC)r#`SCy=#$tvBv9Ed)VFp{S6^UNa!o{7zoNpyfr8YA&_F`QijcsW-b=y*bMu;g F{{aKyYia-h diff --git a/translations/de/LC_MESSAGES/messages.po b/translations/de/LC_MESSAGES/messages.po index 1fcff31..b25ede9 100644 --- a/translations/de/LC_MESSAGES/messages.po +++ b/translations/de/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2020-10-04 12:59+0200\n" +"POT-Creation-Date: 2020-10-04 13:28+0200\n" "PO-Revision-Date: 2020-06-07 18:51+0200\n" "Last-Translator: FULL NAME \n" "Language: de\n" @@ -142,11 +142,11 @@ msgid "Longitude" msgstr "Längengrad" #: forms/admin_unit.py:19 forms/event.py:18 forms/event.py:36 forms/event.py:41 -#: forms/event.py:118 forms/event_place.py:20 forms/organizer.py:19 -#: forms/organizer.py:41 forms/reference.py:18 forms/reference_request.py:14 -#: templates/_macros.html:97 templates/admin/admin_units.html:18 -#: templates/event_place/list.html:19 templates/profile.html:16 -#: templates/profile.html:36 +#: forms/event.py:118 forms/event_place.py:20 forms/event_place.py:42 +#: forms/organizer.py:19 forms/organizer.py:41 forms/reference.py:18 +#: forms/reference_request.py:14 templates/_macros.html:97 +#: templates/admin/admin_units.html:18 templates/event_place/list.html:19 +#: templates/profile.html:16 templates/profile.html:36 msgid "Name" msgstr "Name" @@ -278,7 +278,7 @@ msgstr "Vorheriges Startdatum" msgid "Tags" msgstr "Stichworte" -#: forms/event.py:51 forms/event.py:141 forms/event_place.py:44 +#: forms/event.py:51 forms/event.py:141 forms/event_place.py:48 #: templates/_macros.html:363 templates/event/create.html:59 #: templates/event/update.html:46 templates/manage/events.html:17 #: templates/manage/places.html:17 templates/organizer/create.html:16 @@ -351,7 +351,7 @@ msgstr "Bewertung" #: forms/event.py:73 forms/event.py:74 forms/event.py:105 #: templates/_macros.html:333 templates/event/create.html:84 #: templates/event/update.html:55 templates/event_place/create.html:20 -#: templates/event_place/update.html:20 +#: templates/event_place/delete.html:13 templates/event_place/update.html:20 msgid "Place" msgstr "Ort" @@ -475,7 +475,11 @@ msgstr "Ort hinzufügen" msgid "Update place" msgstr "Ort aktualisieren" -#: forms/event_place.py:43 +#: forms/event_place.py:41 templates/event_place/delete.html:6 +msgid "Delete place" +msgstr "Ort löschen" + +#: forms/event_place.py:47 msgid "Find places" msgstr "Orte finden" @@ -845,7 +849,7 @@ msgstr "Bearbeiten" #: templates/manage/events.html:47 templates/manage/members.html:21 #: templates/manage/members.html:36 templates/manage/organizers.html:23 -#: templates/manage/references_incoming.html:20 +#: templates/manage/places.html:35 templates/manage/references_incoming.html:20 msgid "Delete" msgstr "Löschen" @@ -980,6 +984,14 @@ msgstr "Ort erfolgreich erstellt" msgid "Place successfully updated" msgstr "Ort erfolgreich aktualisiert" +#: views/event_place.py:70 +msgid "Entered name does not match place name" +msgstr "Der eingegebene Name entspricht nicht dem Namen des Ortes" + +#: views/event_place.py:75 +msgid "Place successfully deleted" +msgstr "Ort erfolgreich gelöscht" + #: views/event_review.py:55 views/reference_request_review.py:76 msgid "Event review status updated" msgstr "Prüfungsstatus aktualisiert" diff --git a/views/event_place.py b/views/event_place.py index 7d8038e..515bd37 100644 --- a/views/event_place.py +++ b/views/event_place.py @@ -4,7 +4,7 @@ from flask import render_template, flash, url_for, redirect, request, jsonify from flask_babelex import gettext from flask_security import auth_required from access import has_access, access_or_401, get_admin_unit_for_manage_or_404 -from forms.event_place import UpdateEventPlaceForm, CreateEventPlaceForm +from forms.event_place import UpdateEventPlaceForm, CreateEventPlaceForm, DeleteEventPlaceForm from .utils import flash_errors, upsert_image_with_data, send_mail, handleSqlError from sqlalchemy.sql import asc, func from sqlalchemy.exc import SQLAlchemyError @@ -57,6 +57,34 @@ def event_place_update(id): form=form, place=place) +@app.route('/event_place//delete', methods=('GET', 'POST')) +@auth_required() +def event_place_delete(id): + place = EventPlace.query.get_or_404(id) + access_or_401(place.adminunit, 'place:delete') + + form = DeleteEventPlaceForm() + + if form.validate_on_submit(): + if form.name.data != place.name: + flash(gettext('Entered name does not match place name'), 'danger') + else: + try: + organizer_id=place.organizer.id + db.session.delete(place) + db.session.commit() + flash(gettext('Place successfully deleted'), 'success') + return redirect(url_for('manage_organizer_event_places', organizer_id=organizer_id)) + except SQLAlchemyError as e: + db.session.rollback() + flash(handleSqlError(e), 'danger') + else: + flash_errors(form) + + return render_template('event_place/delete.html', + form=form, + place=place) + def update_event_place_with_form(place, form): form.populate_obj(place)