diff --git a/messages.pot b/messages.pot index 52ecef3..032c419 100644 --- a/messages.pot +++ b/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2023-04-06 22:42+0200\n" +"POT-Creation-Date: 2023-04-08 13:20+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -250,6 +250,7 @@ msgstr "" #: project/templates/_macros.html:237 project/templates/_macros.html:1568 #: project/templates/admin/admin.html:27 project/templates/admin/email.html:4 #: project/templates/admin/email.html:66 project/templates/admin/users.html:19 +#: project/templates/manage/organizers.html:21 msgid "Email" msgstr "" @@ -312,6 +313,8 @@ msgstr "" #: project/forms/reference_request.py:23 #: project/templates/admin/admin_units.html:19 #: project/templates/event_place/list.html:19 +#: project/templates/manage/organizers.html:18 +#: project/templates/manage/places.html:18 #: project/templates/oauth2_client/list.html:25 msgid "Name" msgstr "" @@ -384,13 +387,14 @@ msgstr "" #: project/forms/admin_unit.py:47 project/forms/event.py:106 #: project/forms/event.py:124 project/forms/event_place.py:26 -#: project/forms/organizer.py:26 +#: project/forms/organizer.py:26 project/templates/manage/organizers.html:21 msgid "Link URL" msgstr "" #: project/forms/admin_unit.py:49 project/forms/event.py:108 #: project/forms/event_suggestion.py:31 project/forms/organizer.py:28 #: project/templates/_macros.html:290 +#: project/templates/manage/organizers.html:20 msgid "Phone" msgstr "" @@ -400,6 +404,7 @@ msgid "Fax" msgstr "" #: project/forms/admin_unit.py:51 project/forms/organizer.py:30 +#: project/templates/manage/organizers.html:22 msgid "Logo" msgstr "" @@ -756,6 +761,7 @@ msgid "Choose how people can attend the event." msgstr "" #: project/forms/event.py:225 project/forms/event_place.py:27 +#: project/templates/manage/places.html:21 #: project/templates/widget/event_suggestion/create.html:258 msgid "Photo" msgstr "" @@ -968,6 +974,8 @@ msgstr "" #: project/templates/admin_unit/update.html:39 #: project/templates/event_place/create.html:40 #: project/templates/event_place/update.html:40 +#: project/templates/manage/organizers.html:19 +#: project/templates/manage/places.html:19 #: project/templates/organizer/create.html:36 #: project/templates/organizer/update.html:36 msgid "Location" @@ -985,7 +993,7 @@ msgstr "" #: project/forms/event_place.py:41 project/templates/event_place/create.html:5 #: project/templates/event_place/create.html:21 #: project/templates/event_place/list.html:11 -#: project/templates/manage/places.html:18 +#: project/templates/manage/places.html:11 msgid "Create place" msgstr "" @@ -1086,7 +1094,7 @@ msgstr "" msgid "Revoke OAuth2 token" msgstr "" -#: project/forms/organizer.py:43 project/templates/manage/organizers.html:12 +#: project/forms/organizer.py:43 project/templates/manage/organizers.html:11 #: project/templates/organizer/create.html:5 #: project/templates/organizer/create.html:21 msgid "Create organizer" @@ -1298,8 +1306,8 @@ msgstr "" #: project/templates/admin/users.html:34 #: project/templates/manage/events.html:100 #: project/templates/manage/members.html:35 -#: project/templates/manage/organizers.html:23 -#: project/templates/manage/places.html:27 +#: project/templates/manage/organizers.html:33 +#: project/templates/manage/places.html:31 #: project/templates/manage/references_incoming.html:20 #: project/templates/oauth2_client/list.html:34 #: project/templates/oauth2_client/read.html:17 @@ -1534,7 +1542,7 @@ msgstr "" #: project/templates/event/create.html:5 #: project/templates/event/create.html:221 project/templates/layout.html:207 #: project/templates/manage/events.html:44 -#: project/templates/manage/organizers.html:22 +#: project/templates/manage/organizers.html:38 msgid "Create event" msgstr "" @@ -1578,7 +1586,7 @@ msgid "Outgoing reference requests" msgstr "" #: project/templates/layout.html:245 project/templates/manage/organizers.html:5 -#: project/templates/manage/organizers.html:9 +#: project/templates/manage/organizers.html:10 #: project/templates/organizer/main.html:4 msgid "Organizers" msgstr "" @@ -1586,7 +1594,7 @@ msgstr "" #: project/templates/event_place/list.html:3 #: project/templates/event_place/list.html:7 project/templates/layout.html:246 #: project/templates/manage/places.html:5 -#: project/templates/manage/places.html:9 +#: project/templates/manage/places.html:10 msgid "Places" msgstr "" @@ -1660,7 +1668,7 @@ msgstr "" #: project/templates/admin/admin_units.html:33 #: project/templates/manage/events.html:99 -#: project/templates/manage/organizers.html:21 +#: project/templates/manage/organizers.html:32 #: project/templates/manage/references_incoming.html:19 #: project/templates/manage/references_outgoing.html:19 msgid "View" @@ -1671,8 +1679,8 @@ msgstr "" #: project/templates/manage/events.html:101 #: project/templates/manage/members.html:21 #: project/templates/manage/members.html:36 -#: project/templates/manage/organizers.html:24 -#: project/templates/manage/places.html:28 +#: project/templates/manage/organizers.html:34 +#: project/templates/manage/places.html:32 #: project/templates/manage/references_incoming.html:21 #: project/templates/oauth2_client/list.html:35 msgid "Delete" @@ -1990,8 +1998,18 @@ msgstr "" msgid "Duplicate" msgstr "" -#: project/templates/manage/organizers.html:25 -msgid "Assistents" +#: project/templates/manage/organizers.html:23 +#: project/templates/manage/places.html:22 +msgid "Number of events" +msgstr "" + +#: project/templates/manage/organizers.html:36 +#: project/templates/manage/places.html:34 +msgid "View events" +msgstr "" + +#: project/templates/manage/places.html:20 +msgid "Coordinates" msgstr "" #: project/templates/manage/reference_requests_incoming.html:19 @@ -2244,11 +2262,11 @@ msgstr "" msgid "Event successfully deleted" msgstr "" -#: project/views/event.py:408 +#: project/views/event.py:407 msgid "Referenced event changed" msgstr "" -#: project/views/event.py:431 +#: project/views/event.py:430 msgid "New event report" msgstr "" diff --git a/project/api/organization/resources.py b/project/api/organization/resources.py index 9e6c78a..e8d8467 100644 --- a/project/api/organization/resources.py +++ b/project/api/organization/resources.py @@ -196,7 +196,9 @@ class OrganizationEventImportResource(BaseResource): try: importer = EventImporter(admin_unit.id) - event = importer.load_event_from_url(import_request["url"]) + + with db.session.no_autoflush: + event = importer.load_event_from_url(import_request["url"]) except Exception: abort(422) diff --git a/project/models/event.py b/project/models/event.py index adb438c..abec5ec 100644 --- a/project/models/event.py +++ b/project/models/event.py @@ -36,11 +36,21 @@ class Event(db.Model, TrackableMixin, EventMixin): organizer_id = db.Column( db.Integer, db.ForeignKey("eventorganizer.id"), nullable=False ) - organizer = db.relationship("EventOrganizer", uselist=False) - event_place_id = db.Column( - db.Integer, db.ForeignKey("eventplace.id"), nullable=False + organizer = db.relationship( + "EventOrganizer", + uselist=False, + backref=backref("events", lazy=True), + ) + event_place_id = db.Column( + db.Integer, + db.ForeignKey("eventplace.id"), + nullable=False, + ) + event_place = db.relationship( + "EventPlace", + uselist=False, + backref=backref("events", lazy=True), ) - event_place = db.relationship("EventPlace", uselist=False) categories = relationship("EventCategory", secondary="event_eventcategories") co_organizers = relationship( diff --git a/project/templates/manage/organizers.html b/project/templates/manage/organizers.html index 5ecf04b..480bc5b 100644 --- a/project/templates/manage/organizers.html +++ b/project/templates/manage/organizers.html @@ -1,34 +1,57 @@ {% extends "layout.html" %} {% set active_id = "organizers" %} -{% from "_macros.html" import render_pagination, render_event_organizer %} +{% from "_macros.html" import render_pagination, render_location %} {%- block title -%} {{ _('Organizers') }} {%- endblock -%} {% block content %} -

{{ _('Organizers') }}

+

+ {{ _('Organizers') }} + {{ _('Create organizer') }} +

-
- {{ _('Create organizer') }} +
+ + + + + + + + + + + + + {% for organizer in organizers %} + + + + + + + + + {% endfor %} + +
{{ _('Name') }}{{ _('Location') }}{{ _('Phone') }}{{ _('Email') }} / {{ _('Link URL') }}{{ _('Logo') }}
+ + + {{ render_location(organizer.location) }}{{ organizer.phone or '' }} +
{{ organizer.email or '' }}
+
{{ organizer.url or '' }}
+
{% if organizer.logo %}{% endif %}{{ organizer.events|length }}
- -
{{ render_pagination(pagination) }}
{% endblock %} \ No newline at end of file diff --git a/project/templates/manage/places.html b/project/templates/manage/places.html index 43d8eef..fc0b62e 100644 --- a/project/templates/manage/places.html +++ b/project/templates/manage/places.html @@ -1,37 +1,49 @@ {% extends "layout.html" %} {% set active_id = "places" %} -{% from "_macros.html" import render_pagination, render_field_with_errors, render_event_organizer %} +{% from "_macros.html" import render_pagination, render_location %} {%- block title -%} {{ _('Places') }} {%- endblock -%} {% block content %} -

{{ _('Places') }}

+

+ {{ _('Places') }} + {{ _('Create place') }} +

-
-
- {{ form.hidden_tag() }} -
+
+ + + + + + + + + + + + {% for place in places %} + + + + + + + + {% endfor %} + +
{{ _('Name') }}{{ _('Location') }}{{ _('Photo') }}
+ + + {{ render_location(place.location) }}{% if place.location and place.location.coordinate %}{% endif %}{% if place.photo %}{% endif %}{{ place.events|length }}
- - - -
{{ render_pagination(pagination) }}
{% endblock %} \ No newline at end of file diff --git a/project/translations/de/LC_MESSAGES/messages.mo b/project/translations/de/LC_MESSAGES/messages.mo index 51e7277..eccad08 100644 Binary files a/project/translations/de/LC_MESSAGES/messages.mo and b/project/translations/de/LC_MESSAGES/messages.mo differ diff --git a/project/translations/de/LC_MESSAGES/messages.po b/project/translations/de/LC_MESSAGES/messages.po index 9011763..aeb0678 100644 --- a/project/translations/de/LC_MESSAGES/messages.po +++ b/project/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: 2023-04-06 22:42+0200\n" +"POT-Creation-Date: 2023-04-08 13:20+0200\n" "PO-Revision-Date: 2020-06-07 18:51+0200\n" "Last-Translator: FULL NAME \n" "Language: de\n" @@ -251,6 +251,7 @@ msgstr "Nutzer löschen" #: project/templates/_macros.html:237 project/templates/_macros.html:1568 #: project/templates/admin/admin.html:27 project/templates/admin/email.html:4 #: project/templates/admin/email.html:66 project/templates/admin/users.html:19 +#: project/templates/manage/organizers.html:21 msgid "Email" msgstr "Email" @@ -321,6 +322,8 @@ msgstr "Organisation löschen" #: project/forms/reference_request.py:23 #: project/templates/admin/admin_units.html:19 #: project/templates/event_place/list.html:19 +#: project/templates/manage/organizers.html:18 +#: project/templates/manage/places.html:18 #: project/templates/oauth2_client/list.html:25 msgid "Name" msgstr "Name" @@ -396,13 +399,14 @@ msgstr "Der Kurzname darf nur Buchstaben, Nummern und Unterstriche enthalten" #: project/forms/admin_unit.py:47 project/forms/event.py:106 #: project/forms/event.py:124 project/forms/event_place.py:26 -#: project/forms/organizer.py:26 +#: project/forms/organizer.py:26 project/templates/manage/organizers.html:21 msgid "Link URL" msgstr "Link URL" #: project/forms/admin_unit.py:49 project/forms/event.py:108 #: project/forms/event_suggestion.py:31 project/forms/organizer.py:28 #: project/templates/_macros.html:290 +#: project/templates/manage/organizers.html:20 msgid "Phone" msgstr "Telefon" @@ -412,6 +416,7 @@ msgid "Fax" msgstr "Fax" #: project/forms/admin_unit.py:51 project/forms/organizer.py:30 +#: project/templates/manage/organizers.html:22 msgid "Logo" msgstr "Logo" @@ -788,6 +793,7 @@ msgid "Choose how people can attend the event." msgstr "Wähle aus, wie Personen an der Veranstaltung teilnehmen können." #: project/forms/event.py:225 project/forms/event_place.py:27 +#: project/templates/manage/places.html:21 #: project/templates/widget/event_suggestion/create.html:258 msgid "Photo" msgstr "Foto" @@ -1012,6 +1018,8 @@ msgstr "Veranstaltungen finden" #: project/templates/admin_unit/update.html:39 #: project/templates/event_place/create.html:40 #: project/templates/event_place/update.html:40 +#: project/templates/manage/organizers.html:19 +#: project/templates/manage/places.html:19 #: project/templates/organizer/create.html:36 #: project/templates/organizer/update.html:36 msgid "Location" @@ -1029,7 +1037,7 @@ msgstr "Finden" #: project/forms/event_place.py:41 project/templates/event_place/create.html:5 #: project/templates/event_place/create.html:21 #: project/templates/event_place/list.html:11 -#: project/templates/manage/places.html:18 +#: project/templates/manage/places.html:11 msgid "Create place" msgstr "Ort hinzufügen" @@ -1134,7 +1142,7 @@ msgstr "OAuth2 Client löschen" msgid "Revoke OAuth2 token" msgstr "OAuth2 Token widerrufen" -#: project/forms/organizer.py:43 project/templates/manage/organizers.html:12 +#: project/forms/organizer.py:43 project/templates/manage/organizers.html:11 #: project/templates/organizer/create.html:5 #: project/templates/organizer/create.html:21 msgid "Create organizer" @@ -1355,8 +1363,8 @@ msgstr "Merkzettel" #: project/templates/admin/users.html:34 #: project/templates/manage/events.html:100 #: project/templates/manage/members.html:35 -#: project/templates/manage/organizers.html:23 -#: project/templates/manage/places.html:27 +#: project/templates/manage/organizers.html:33 +#: project/templates/manage/places.html:31 #: project/templates/manage/references_incoming.html:20 #: project/templates/oauth2_client/list.html:34 #: project/templates/oauth2_client/read.html:17 @@ -1591,7 +1599,7 @@ msgstr "Veranstaltungen anzeigen" #: project/templates/event/create.html:5 #: project/templates/event/create.html:221 project/templates/layout.html:207 #: project/templates/manage/events.html:44 -#: project/templates/manage/organizers.html:22 +#: project/templates/manage/organizers.html:38 msgid "Create event" msgstr "Veranstaltung erstellen" @@ -1635,7 +1643,7 @@ msgid "Outgoing reference requests" msgstr "Ausgehende Empfehlungsanfragen" #: project/templates/layout.html:245 project/templates/manage/organizers.html:5 -#: project/templates/manage/organizers.html:9 +#: project/templates/manage/organizers.html:10 #: project/templates/organizer/main.html:4 msgid "Organizers" msgstr "Veranstalter" @@ -1643,7 +1651,7 @@ msgstr "Veranstalter" #: project/templates/event_place/list.html:3 #: project/templates/event_place/list.html:7 project/templates/layout.html:246 #: project/templates/manage/places.html:5 -#: project/templates/manage/places.html:9 +#: project/templates/manage/places.html:10 msgid "Places" msgstr "Orte" @@ -1717,7 +1725,7 @@ msgstr "Nutzer" #: project/templates/admin/admin_units.html:33 #: project/templates/manage/events.html:99 -#: project/templates/manage/organizers.html:21 +#: project/templates/manage/organizers.html:32 #: project/templates/manage/references_incoming.html:19 #: project/templates/manage/references_outgoing.html:19 msgid "View" @@ -1728,8 +1736,8 @@ msgstr "Anzeigen" #: project/templates/manage/events.html:101 #: project/templates/manage/members.html:21 #: project/templates/manage/members.html:36 -#: project/templates/manage/organizers.html:24 -#: project/templates/manage/places.html:28 +#: project/templates/manage/organizers.html:34 +#: project/templates/manage/places.html:32 #: project/templates/manage/references_incoming.html:21 #: project/templates/oauth2_client/list.html:35 msgid "Delete" @@ -2056,9 +2064,19 @@ msgstr "Anzahl an Empfehlungsanfragen" msgid "Duplicate" msgstr "Duplizieren" -#: project/templates/manage/organizers.html:25 -msgid "Assistents" -msgstr "Assistenten" +#: project/templates/manage/organizers.html:23 +#: project/templates/manage/places.html:22 +msgid "Number of events" +msgstr "Anzahl an Veranstaltungen" + +#: project/templates/manage/organizers.html:36 +#: project/templates/manage/places.html:34 +msgid "View events" +msgstr "Veranstaltungen anzeigen" + +#: project/templates/manage/places.html:20 +msgid "Coordinates" +msgstr "Koordinaten" #: project/templates/manage/reference_requests_incoming.html:19 msgid "Review request" @@ -2315,11 +2333,11 @@ msgstr "Veranstaltung erfolgreich aktualisiert" msgid "Event successfully deleted" msgstr "Veranstaltung erfolgreich gelöscht" -#: project/views/event.py:408 +#: project/views/event.py:407 msgid "Referenced event changed" msgstr "Empfohlene Veranstaltung wurde geändert" -#: project/views/event.py:431 +#: project/views/event.py:430 msgid "New event report" msgstr "Neue Meldung zu einer Veranstaltung" @@ -2566,3 +2584,6 @@ msgstr "Neue Veranstaltung zu prüfen" #~ msgid "Veranstaltungen als iFrame einbetten" #~ msgstr "Veranstaltungen als iFrame einbetten" +#~ msgid "Assistents" +#~ msgstr "Assistenten" + diff --git a/project/translations/en/LC_MESSAGES/messages.mo b/project/translations/en/LC_MESSAGES/messages.mo index c0a2856..118997d 100644 Binary files a/project/translations/en/LC_MESSAGES/messages.mo and b/project/translations/en/LC_MESSAGES/messages.mo differ diff --git a/project/translations/en/LC_MESSAGES/messages.po b/project/translations/en/LC_MESSAGES/messages.po index 2ad0859..fec493f 100644 --- a/project/translations/en/LC_MESSAGES/messages.po +++ b/project/translations/en/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: 2023-04-06 22:42+0200\n" +"POT-Creation-Date: 2023-04-08 13:20+0200\n" "PO-Revision-Date: 2021-04-30 15:04+0200\n" "Last-Translator: FULL NAME \n" "Language: en\n" @@ -251,6 +251,7 @@ msgstr "" #: project/templates/_macros.html:237 project/templates/_macros.html:1568 #: project/templates/admin/admin.html:27 project/templates/admin/email.html:4 #: project/templates/admin/email.html:66 project/templates/admin/users.html:19 +#: project/templates/manage/organizers.html:21 msgid "Email" msgstr "" @@ -313,6 +314,8 @@ msgstr "" #: project/forms/reference_request.py:23 #: project/templates/admin/admin_units.html:19 #: project/templates/event_place/list.html:19 +#: project/templates/manage/organizers.html:18 +#: project/templates/manage/places.html:18 #: project/templates/oauth2_client/list.html:25 msgid "Name" msgstr "" @@ -385,13 +388,14 @@ msgstr "" #: project/forms/admin_unit.py:47 project/forms/event.py:106 #: project/forms/event.py:124 project/forms/event_place.py:26 -#: project/forms/organizer.py:26 +#: project/forms/organizer.py:26 project/templates/manage/organizers.html:21 msgid "Link URL" msgstr "" #: project/forms/admin_unit.py:49 project/forms/event.py:108 #: project/forms/event_suggestion.py:31 project/forms/organizer.py:28 #: project/templates/_macros.html:290 +#: project/templates/manage/organizers.html:20 msgid "Phone" msgstr "" @@ -401,6 +405,7 @@ msgid "Fax" msgstr "" #: project/forms/admin_unit.py:51 project/forms/organizer.py:30 +#: project/templates/manage/organizers.html:22 msgid "Logo" msgstr "" @@ -757,6 +762,7 @@ msgid "Choose how people can attend the event." msgstr "" #: project/forms/event.py:225 project/forms/event_place.py:27 +#: project/templates/manage/places.html:21 #: project/templates/widget/event_suggestion/create.html:258 msgid "Photo" msgstr "" @@ -969,6 +975,8 @@ msgstr "" #: project/templates/admin_unit/update.html:39 #: project/templates/event_place/create.html:40 #: project/templates/event_place/update.html:40 +#: project/templates/manage/organizers.html:19 +#: project/templates/manage/places.html:19 #: project/templates/organizer/create.html:36 #: project/templates/organizer/update.html:36 msgid "Location" @@ -986,7 +994,7 @@ msgstr "" #: project/forms/event_place.py:41 project/templates/event_place/create.html:5 #: project/templates/event_place/create.html:21 #: project/templates/event_place/list.html:11 -#: project/templates/manage/places.html:18 +#: project/templates/manage/places.html:11 msgid "Create place" msgstr "" @@ -1087,7 +1095,7 @@ msgstr "" msgid "Revoke OAuth2 token" msgstr "" -#: project/forms/organizer.py:43 project/templates/manage/organizers.html:12 +#: project/forms/organizer.py:43 project/templates/manage/organizers.html:11 #: project/templates/organizer/create.html:5 #: project/templates/organizer/create.html:21 msgid "Create organizer" @@ -1306,8 +1314,8 @@ msgstr "" #: project/templates/admin/users.html:34 #: project/templates/manage/events.html:100 #: project/templates/manage/members.html:35 -#: project/templates/manage/organizers.html:23 -#: project/templates/manage/places.html:27 +#: project/templates/manage/organizers.html:33 +#: project/templates/manage/places.html:31 #: project/templates/manage/references_incoming.html:20 #: project/templates/oauth2_client/list.html:34 #: project/templates/oauth2_client/read.html:17 @@ -1542,7 +1550,7 @@ msgstr "" #: project/templates/event/create.html:5 #: project/templates/event/create.html:221 project/templates/layout.html:207 #: project/templates/manage/events.html:44 -#: project/templates/manage/organizers.html:22 +#: project/templates/manage/organizers.html:38 msgid "Create event" msgstr "" @@ -1586,7 +1594,7 @@ msgid "Outgoing reference requests" msgstr "" #: project/templates/layout.html:245 project/templates/manage/organizers.html:5 -#: project/templates/manage/organizers.html:9 +#: project/templates/manage/organizers.html:10 #: project/templates/organizer/main.html:4 msgid "Organizers" msgstr "" @@ -1594,7 +1602,7 @@ msgstr "" #: project/templates/event_place/list.html:3 #: project/templates/event_place/list.html:7 project/templates/layout.html:246 #: project/templates/manage/places.html:5 -#: project/templates/manage/places.html:9 +#: project/templates/manage/places.html:10 msgid "Places" msgstr "" @@ -1668,7 +1676,7 @@ msgstr "" #: project/templates/admin/admin_units.html:33 #: project/templates/manage/events.html:99 -#: project/templates/manage/organizers.html:21 +#: project/templates/manage/organizers.html:32 #: project/templates/manage/references_incoming.html:19 #: project/templates/manage/references_outgoing.html:19 msgid "View" @@ -1679,8 +1687,8 @@ msgstr "" #: project/templates/manage/events.html:101 #: project/templates/manage/members.html:21 #: project/templates/manage/members.html:36 -#: project/templates/manage/organizers.html:24 -#: project/templates/manage/places.html:28 +#: project/templates/manage/organizers.html:34 +#: project/templates/manage/places.html:32 #: project/templates/manage/references_incoming.html:21 #: project/templates/oauth2_client/list.html:35 msgid "Delete" @@ -1998,8 +2006,18 @@ msgstr "" msgid "Duplicate" msgstr "" -#: project/templates/manage/organizers.html:25 -msgid "Assistents" +#: project/templates/manage/organizers.html:23 +#: project/templates/manage/places.html:22 +msgid "Number of events" +msgstr "" + +#: project/templates/manage/organizers.html:36 +#: project/templates/manage/places.html:34 +msgid "View events" +msgstr "" + +#: project/templates/manage/places.html:20 +msgid "Coordinates" msgstr "" #: project/templates/manage/reference_requests_incoming.html:19 @@ -2252,11 +2270,11 @@ msgstr "" msgid "Event successfully deleted" msgstr "" -#: project/views/event.py:408 +#: project/views/event.py:407 msgid "Referenced event changed" msgstr "" -#: project/views/event.py:431 +#: project/views/event.py:430 msgid "New event report" msgstr "" @@ -2488,3 +2506,6 @@ msgstr "" #~ msgid "Veranstaltungen als iFrame einbetten" #~ msgstr "" +#~ msgid "Assistents" +#~ msgstr "" + diff --git a/project/views/manage.py b/project/views/manage.py index c647544..b832046 100644 --- a/project/views/manage.py +++ b/project/views/manage.py @@ -198,7 +198,7 @@ def manage_admin_unit_organizers(id): organizers = ( EventOrganizer.query.filter(EventOrganizer.admin_unit_id == admin_unit.id) .order_by(func.lower(EventOrganizer.name)) - .paginate() + .paginate(per_page=50) ) return render_template( @@ -220,7 +220,7 @@ def manage_admin_unit_event_places(id): places = ( EventPlace.query.filter(EventPlace.admin_unit_id == admin_unit.id) .order_by(func.lower(EventPlace.name)) - .paginate() + .paginate(per_page=50) ) return render_template( "manage/places.html", diff --git a/tests/services/importer/test_event_importer.py b/tests/services/importer/test_event_importer.py index 7800292..a4a2c41 100644 --- a/tests/services/importer/test_event_importer.py +++ b/tests/services/importer/test_event_importer.py @@ -3,12 +3,12 @@ import pytest # Load more urls: # curl -o tests/services/importer/data/.html -def test_import(client, seeder, utils, app, shared_datadir, requests_mock): +def test_import(client, seeder, utils, app, db, shared_datadir, requests_mock): _, admin_unit_id = seeder.setup_base() seeder.upsert_event_place(admin_unit_id, "MINER'S ROCK") seeder.upsert_event_organizer(admin_unit_id, "MINER'S ROCK") - params = (utils, admin_unit_id, shared_datadir) + params = (utils, admin_unit_id, shared_datadir, db) with app.app_context(): _assert_import_event( @@ -76,12 +76,14 @@ def test_import(client, seeder, utils, app, shared_datadir, requests_mock): def _assert_import_event(params, filename, url, sanitized_url=None): from project.services.importer.event_importer import EventImporter - utils, admin_unit_id, datadir = params + utils, admin_unit_id, datadir, db = params mock_url = sanitized_url if sanitized_url else url utils.mock_get_request_with_file(mock_url, datadir, filename) importer = EventImporter(admin_unit_id) - event = importer.load_event_from_url(url) + + with db.session.no_autoflush: + event = importer.load_event_from_url(url) assert event is not None return event diff --git a/tests/views/test_utils.py b/tests/views/test_utils.py index b298535..7b3b02b 100644 --- a/tests/views/test_utils.py +++ b/tests/views/test_utils.py @@ -23,7 +23,7 @@ def test_send_mails(client, seeder, app, utils): def test_get_pagination_urls(client, seeder, app, utils): user_id, admin_unit_id = seeder.setup_base() - for i in range(31): + for i in range(101): seeder.upsert_event_organizer(admin_unit_id, "Organizer %d" % i) utils.get_endpoint_ok(