From 04884c9dee5e3e48b4f813d4225b85121add8aa2 Mon Sep 17 00:00:00 2001 From: Daniel Grams Date: Fri, 20 Aug 2021 09:43:53 +0200 Subject: [PATCH] Introduce switch suggestions_enabled for Organizations #273 --- messages.pot | 106 +++++++++-------- migrations/versions/924071080036_.py | 31 +++++ package-lock.json | 14 +-- package.json | 2 +- project/access.py | 5 + project/cli/test.py | 1 + project/forms/admin.py | 5 + project/models.py | 8 ++ project/static/infoscreen.css | 44 ------- .../templates/admin/update_admin_unit.html | 1 + project/templates/layout.html | 14 ++- project/templates/manage/widgets.html | 6 +- project/templates/widget/infoscreen/read.html | 104 ----------------- .../translations/de/LC_MESSAGES/messages.mo | Bin 29083 -> 29212 bytes .../translations/de/LC_MESSAGES/messages.po | 109 ++++++++++-------- .../translations/en/LC_MESSAGES/messages.mo | Bin 3225 -> 3225 bytes .../translations/en/LC_MESSAGES/messages.po | 109 ++++++++++-------- project/views/manage.py | 2 + project/views/widget.py | 29 ++--- tests/api/test_event_date.py | 4 + tests/seeder.py | 3 +- tests/views/test_admin.py | 3 + tests/views/test_widget.py | 27 ++--- 23 files changed, 270 insertions(+), 357 deletions(-) create mode 100644 migrations/versions/924071080036_.py delete mode 100644 project/static/infoscreen.css delete mode 100644 project/templates/widget/infoscreen/read.html diff --git a/messages.pot b/messages.pot index 2cf03dc..5e219d3 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: 2021-08-15 14:50+0200\n" +"POT-Creation-Date: 2021-08-20 08:42+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -165,24 +165,24 @@ msgstr "" msgid "." msgstr "" -#: project/forms/admin.py:10 project/templates/layout.html:331 +#: project/forms/admin.py:10 project/templates/layout.html:335 #: project/views/root.py:42 msgid "Terms of service" msgstr "" -#: project/forms/admin.py:11 project/templates/layout.html:335 +#: project/forms/admin.py:11 project/templates/layout.html:339 #: project/views/root.py:50 msgid "Legal notice" msgstr "" #: project/forms/admin.py:12 project/templates/_macros.html:1328 -#: project/templates/layout.html:339 +#: project/templates/layout.html:343 #: project/templates/widget/event_suggestion/create.html:199 #: project/views/admin_unit.py:36 project/views/root.py:58 msgid "Contact" msgstr "" -#: project/forms/admin.py:13 project/templates/layout.html:343 +#: project/forms/admin.py:13 project/templates/layout.html:347 #: project/views/root.py:66 msgid "Privacy" msgstr "" @@ -211,7 +211,15 @@ msgid "" "event." msgstr "" -#: project/forms/admin.py:31 project/templates/admin/update_admin_unit.html:4 +#: project/forms/admin.py:32 +msgid "Suggestions enabled" +msgstr "" + +#: project/forms/admin.py:33 +msgid "If set, the organization can work with suggestions." +msgstr "" + +#: project/forms/admin.py:36 project/templates/admin/update_admin_unit.html:4 #: project/templates/admin/update_admin_unit.html:8 msgid "Update organization" msgstr "" @@ -268,7 +276,7 @@ msgstr "" msgid "The short name is used to create a unique identifier for your events" msgstr "" -#: project/forms/admin_unit.py:40 project/templates/_macros.html:1458 +#: project/forms/admin_unit.py:40 project/templates/_macros.html:1464 msgid "Short name must contain only letters numbers or underscore" msgstr "" @@ -282,7 +290,7 @@ msgstr "" #: project/forms/admin_unit_member.py:23 project/forms/admin_unit_member.py:28 #: project/forms/event.py:58 project/forms/event_suggestion.py:38 #: project/forms/organizer.py:27 project/templates/_macros.html:262 -#: project/templates/_macros.html:1418 project/templates/admin/users.html:19 +#: project/templates/_macros.html:1424 project/templates/admin/users.html:19 msgid "Email" msgstr "" @@ -642,7 +650,7 @@ msgstr "" #: project/forms/event.py:231 project/forms/reference.py:14 #: project/forms/reference.py:27 project/forms/reference_request.py:75 #: project/templates/event/create.html:358 -#: project/templates/event/update.html:214 +#: project/templates/event/update.html:215 msgid "Rating" msgstr "" @@ -657,7 +665,7 @@ msgstr "" #: project/forms/event.py:321 project/forms/event_suggestion.py:50 #: project/templates/_macros.html:468 project/templates/_macros.html:624 #: project/templates/event/create.html:283 -#: project/templates/event/update.html:164 +#: project/templates/event/update.html:165 #: project/templates/event_place/create.html:21 #: project/templates/event_place/delete.html:13 #: project/templates/event_place/update.html:21 @@ -676,7 +684,7 @@ msgstr "" #: project/forms/event.py:329 project/forms/event.py:389 #: project/forms/event_suggestion.py:60 project/templates/_macros.html:506 #: project/templates/_macros.html:661 project/templates/event/create.html:254 -#: project/templates/event/update.html:155 +#: project/templates/event/update.html:156 #: project/templates/organizer/create.html:17 #: project/templates/organizer/delete.html:13 #: project/templates/organizer/update.html:17 @@ -818,7 +826,7 @@ msgid "Distance" msgstr "" #: project/forms/event_date.py:30 project/forms/planing.py:34 -#: project/templates/widget/event_date/list.html:42 +#: project/templates/widget/event_date/list.html:53 msgid "Find" msgstr "" @@ -946,7 +954,7 @@ msgstr "" #: project/templates/_macros.html:527 project/templates/_macros.html:687 #: project/templates/admin_unit/create.html:19 #: project/templates/admin_unit/update.html:20 -#: project/templates/layout.html:286 +#: project/templates/layout.html:289 msgid "Organization" msgstr "" @@ -1090,12 +1098,12 @@ msgid "%(count)d event dates" msgstr "" #: project/templates/_macros.html:451 project/templates/_macros.html:606 -#: project/templates/_macros.html:1403 project/templates/event/actions.html:32 +#: project/templates/_macros.html:1409 project/templates/event/actions.html:32 msgid "Share" msgstr "" #: project/templates/_macros.html:455 project/templates/_macros.html:610 -#: project/templates/_macros.html:1433 +#: project/templates/_macros.html:1439 msgid "Add to calendar" msgstr "" @@ -1189,27 +1197,27 @@ msgstr "" msgid "Event suggestion" msgstr "" -#: project/templates/_macros.html:1412 +#: project/templates/_macros.html:1418 msgid "Link copied" msgstr "" -#: project/templates/_macros.html:1412 +#: project/templates/_macros.html:1418 msgid "Copy link" msgstr "" -#: project/templates/_macros.html:1441 +#: project/templates/_macros.html:1447 msgid "Google calendar" msgstr "" -#: project/templates/_macros.html:1442 +#: project/templates/_macros.html:1448 msgid "Apple calendar" msgstr "" -#: project/templates/_macros.html:1443 +#: project/templates/_macros.html:1449 msgid "Yahoo calendar" msgstr "" -#: project/templates/_macros.html:1444 +#: project/templates/_macros.html:1450 msgid "Other calendar" msgstr "" @@ -1218,12 +1226,12 @@ msgid "Manage" msgstr "" #: project/templates/home.html:29 project/templates/security/login_user.html:35 -#: project/views/widget.py:180 +#: project/views/widget.py:165 msgid "Register for free" msgstr "" #: project/templates/event_place/read.html:22 project/templates/layout.html:206 -#: project/templates/layout.html:249 project/templates/manage/events.html:5 +#: project/templates/layout.html:250 project/templates/manage/events.html:5 #: project/templates/manage/events.html:9 msgid "Events" msgstr "" @@ -1264,60 +1272,60 @@ msgstr "" msgid "Logout" msgstr "" -#: project/templates/layout.html:255 +#: project/templates/layout.html:256 msgid "Show events" msgstr "" #: project/templates/event/create.html:4 -#: project/templates/event/create.html:221 project/templates/layout.html:256 +#: project/templates/event/create.html:221 project/templates/layout.html:257 #: project/templates/manage/events.html:12 #: project/templates/manage/organizers.html:21 msgid "Create event" msgstr "" -#: project/templates/layout.html:258 +#: project/templates/layout.html:260 msgid "Review suggestions" msgstr "" -#: project/templates/layout.html:267 +#: project/templates/layout.html:270 #: project/templates/manage/references_incoming.html:5 #: project/templates/manage/references_outgoing.html:5 msgid "References" msgstr "" -#: project/templates/layout.html:273 +#: project/templates/layout.html:276 #: project/templates/manage/references_incoming.html:9 msgid "Incoming references" msgstr "" -#: project/templates/layout.html:274 +#: project/templates/layout.html:277 #: project/templates/manage/references_outgoing.html:9 msgid "Outgoing references" msgstr "" -#: project/templates/layout.html:276 +#: project/templates/layout.html:279 #: project/templates/manage/reference_requests_incoming.html:9 msgid "Incoming reference requests" msgstr "" -#: project/templates/layout.html:281 +#: project/templates/layout.html:284 #: project/templates/manage/reference_requests_outgoing.html:9 msgid "Outgoing reference requests" msgstr "" -#: project/templates/layout.html:289 project/templates/manage/organizers.html:5 +#: project/templates/layout.html:292 project/templates/manage/organizers.html:5 #: project/templates/manage/organizers.html:9 msgid "Organizers" msgstr "" #: project/templates/event_place/list.html:3 -#: project/templates/event_place/list.html:7 project/templates/layout.html:290 +#: project/templates/event_place/list.html:7 project/templates/layout.html:293 #: project/templates/manage/places.html:5 #: project/templates/manage/places.html:9 msgid "Places" msgstr "" -#: project/templates/layout.html:292 project/templates/manage/members.html:5 +#: project/templates/layout.html:295 project/templates/manage/members.html:5 #: project/templates/manage/members.html:28 msgid "Members" msgstr "" @@ -1326,22 +1334,22 @@ msgstr "" #: project/templates/admin/settings.html:4 #: project/templates/admin/settings.html:8 #: project/templates/admin_unit/update.html:14 -#: project/templates/layout.html:293 project/templates/manage/widgets.html:12 +#: project/templates/layout.html:296 project/templates/manage/widgets.html:12 #: project/templates/profile.html:19 msgid "Settings" msgstr "" -#: project/templates/layout.html:294 project/templates/manage/reviews.html:10 +#: project/templates/layout.html:297 project/templates/manage/reviews.html:10 #: project/templates/manage/widgets.html:5 #: project/templates/manage/widgets.html:9 msgid "Widgets" msgstr "" -#: project/templates/layout.html:304 +#: project/templates/layout.html:307 msgid "Switch organization" msgstr "" -#: project/templates/developer/read.html:4 project/templates/layout.html:353 +#: project/templates/developer/read.html:4 project/templates/layout.html:357 #: project/templates/profile.html:29 msgid "Developer" msgstr "" @@ -1382,7 +1390,7 @@ msgstr "" #: project/templates/admin_unit/create.html:49 #: project/templates/admin_unit/update.html:50 #: project/templates/event/create.html:346 -#: project/templates/event/update.html:202 +#: project/templates/event/update.html:203 #: project/templates/event_place/create.html:47 #: project/templates/event_place/update.html:47 #: project/templates/organizer/create.html:46 @@ -1513,12 +1521,12 @@ msgid "Switch to place search" msgstr "" #: project/templates/event/create.html:319 -#: project/templates/event/update.html:175 +#: project/templates/event/update.html:176 msgid "Access" msgstr "" #: project/templates/event/create.html:333 -#: project/templates/event/update.html:189 +#: project/templates/event/update.html:190 msgid "Target group" msgstr "" @@ -1627,14 +1635,10 @@ msgstr "" msgid "Veranstaltungen als iFrame einbetten" msgstr "" -#: project/templates/manage/widgets.html:32 +#: project/templates/manage/widgets.html:33 msgid "Link, um Veranstaltungen vorzuschlagen" msgstr "" -#: project/templates/manage/widgets.html:36 -msgid "URL für Infoscreen" -msgstr "" - #: project/templates/oauth2_client/create.html:4 #: project/templates/oauth2_client/create.html:8 #: project/templates/oauth2_client/list.html:17 @@ -1729,7 +1733,7 @@ msgstr "" msgid "Widget" msgstr "" -#: project/templates/widget/event_date/list.html:105 +#: project/templates/widget/event_date/list.html:116 msgid "Print" msgstr "" @@ -1749,7 +1753,7 @@ msgstr "" msgid "Organization successfully updated" msgstr "" -#: project/views/admin.py:68 project/views/manage.py:260 +#: project/views/admin.py:68 project/views/manage.py:270 msgid "Settings successfully updated" msgstr "" @@ -1961,17 +1965,17 @@ msgstr "" msgid "You do not have permission for this action" msgstr "" -#: project/views/widget.py:172 +#: project/views/widget.py:157 msgid "Thank you so much! The event is being verified." msgstr "" -#: project/views/widget.py:176 +#: project/views/widget.py:161 msgid "" "For more options and your own calendar of events, you can register for " "free." msgstr "" -#: project/views/widget.py:239 +#: project/views/widget.py:224 msgid "New event review" msgstr "" diff --git a/migrations/versions/924071080036_.py b/migrations/versions/924071080036_.py new file mode 100644 index 0000000..4f2a08e --- /dev/null +++ b/migrations/versions/924071080036_.py @@ -0,0 +1,31 @@ +"""empty message + +Revision ID: 924071080036 +Revises: 6893de0cb15b +Create Date: 2021-08-20 08:15:53.480243 + +""" +import sqlalchemy as sa +import sqlalchemy_utils +from alembic import op + +from project import dbtypes + +# revision identifiers, used by Alembic. +revision = "924071080036" +down_revision = "6893de0cb15b" +branch_labels = None +depends_on = None + + +def upgrade(): + op.add_column( + "adminunit", + sa.Column( + "suggestions_enabled", sa.Boolean(), nullable=False, server_default="0" + ), + ) + + +def downgrade(): + op.drop_column("adminunit", "suggestions_enabled") diff --git a/package-lock.json b/package-lock.json index 0e445bd..c3b8d25 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "ISC", "devDependencies": { - "cypress": "^8.1.0" + "cypress": "^8.3.0" } }, "node_modules/@cypress/request": { @@ -498,9 +498,9 @@ } }, "node_modules/cypress": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-8.1.0.tgz", - "integrity": "sha512-GXjlqPjY/6HPbQwAp3AvlA1Mk/NoJTAmqVSUhQsuM/1xDpd/FQHkxVuq5h6O6RrAoCXSgpZPXFsVtdqE+FwEJw==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-8.3.0.tgz", + "integrity": "sha512-zA5Rcq8AZIfRfPXU0CCcauofF+YpaU9HYbfqkunFTmFV0Kdlo14tNjH2E3++MkjXKFnv3/pXq+HgxWtw8CSe8Q==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -2209,9 +2209,9 @@ } }, "cypress": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-8.1.0.tgz", - "integrity": "sha512-GXjlqPjY/6HPbQwAp3AvlA1Mk/NoJTAmqVSUhQsuM/1xDpd/FQHkxVuq5h6O6RrAoCXSgpZPXFsVtdqE+FwEJw==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-8.3.0.tgz", + "integrity": "sha512-zA5Rcq8AZIfRfPXU0CCcauofF+YpaU9HYbfqkunFTmFV0Kdlo14tNjH2E3++MkjXKFnv3/pXq+HgxWtw8CSe8Q==", "dev": true, "requires": { "@cypress/request": "^2.88.5", diff --git a/package.json b/package.json index 50ca69b..4a3629a 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,6 @@ }, "homepage": "https://github.com/DanielGrams/gsevpt#readme", "devDependencies": { - "cypress": "^8.1.0" + "cypress": "^8.3.0" } } diff --git a/project/access.py b/project/access.py index 561bb61..0732bab 100644 --- a/project/access.py +++ b/project/access.py @@ -171,6 +171,11 @@ def get_admin_unit_for_manage_or_404(admin_unit_id): return admin_unit +def admin_unit_suggestions_enabled_or_404(admin_unit: AdminUnit): + if not admin_unit.suggestions_enabled: + abort(404) + + def can_create_admin_unit(): if not current_user.is_authenticated: # pragma: no cover return False diff --git a/project/cli/test.py b/project/cli/test.py index 5329137..d433f3d 100644 --- a/project/cli/test.py +++ b/project/cli/test.py @@ -103,6 +103,7 @@ def _create_admin_unit(user_id, name): admin_unit.name = name admin_unit.short_name = name.lower().replace(" ", "") admin_unit.incoming_reference_requests_allowed = True + admin_unit.suggestions_enabled = True admin_unit.location = Location() admin_unit.location.postalCode = "38640" admin_unit.location.city = "Goslar" diff --git a/project/forms/admin.py b/project/forms/admin.py index 3f4b88e..35cc1d1 100644 --- a/project/forms/admin.py +++ b/project/forms/admin.py @@ -28,4 +28,9 @@ class UpdateAdminUnitForm(FlaskForm): ), validators=[Optional()], ) + suggestions_enabled = BooleanField( + lazy_gettext("Suggestions enabled"), + description=lazy_gettext("If set, the organization can work with suggestions."), + validators=[Optional()], + ) submit = SubmitField(lazy_gettext("Update organization")) diff --git a/project/models.py b/project/models.py index a13b1c4..1e33b69 100644 --- a/project/models.py +++ b/project/models.py @@ -323,6 +323,14 @@ class AdminUnit(db.Model, TrackableMixin): widget_primary_color = deferred(Column(ColorType), group="widget") widget_link_color = deferred(Column(ColorType), group="widget") incoming_reference_requests_allowed = deferred(Column(Boolean())) + suggestions_enabled = deferred( + Column( + Boolean(), + nullable=False, + default=False, + server_default="0", + ) + ) @listens_for(AdminUnit, "before_insert") diff --git a/project/static/infoscreen.css b/project/static/infoscreen.css deleted file mode 100644 index f41cf05..0000000 --- a/project/static/infoscreen.css +++ /dev/null @@ -1,44 +0,0 @@ -html, body { - width: 100vw; - height: 100vh; - max-height: -webkit-fill-available; - margin: 0; - font-size: 2.5vmin; -} - - -.body-content { - width: 100vw; - height: 100vh; - max-height: -webkit-fill-available; - padding: 0; -} - -h1 { - font-size: 1.8rem; - margin: 0; -} - -h2 { - margin: 0.4rem 0 0rem; -} - -h3 { - font-size: 1.4rem; - margin: 0rem 0 1rem; -} - -h4 { - font-size: 1.1rem; -} - -/* Add an extra .carousel parent class to increase specificity - avoiding the use of !important flag. */ -.carousel .carousel-indicators li { -background-color: #fff; -background-color: rgba(70, 70, 70, 0.25); -} - -.carousel .carousel-indicators .active { -background-color: #444; -} \ No newline at end of file diff --git a/project/templates/admin/update_admin_unit.html b/project/templates/admin/update_admin_unit.html index 27b69d0..00baf8d 100644 --- a/project/templates/admin/update_admin_unit.html +++ b/project/templates/admin/update_admin_unit.html @@ -16,6 +16,7 @@
{{ render_field_with_errors(form.incoming_reference_requests_allowed, ri="switch") }} + {{ render_field_with_errors(form.suggestions_enabled, ri="switch") }}
diff --git a/project/templates/layout.html b/project/templates/layout.html index 72b33ca..2e6fc8d 100644 --- a/project/templates/layout.html +++ b/project/templates/layout.html @@ -255,12 +255,14 @@
{{ _('Show events') }} {{ _('Create event') }} -
- {{ _('Review suggestions') }} - {% if menu_options['reviews_badge'] > 0 %} - {{ menu_options['reviews_badge'] }} - {% endif %} - + {% if current_admin_unit.suggestions_enabled %} +
+ {{ _('Review suggestions') }} + {% if menu_options['reviews_badge'] > 0 %} + {{ menu_options['reviews_badge'] }} + {% endif %} + + {% endif %}
  • diff --git a/project/templates/manage/widgets.html b/project/templates/manage/widgets.html index b3874a5..1bafeee 100644 --- a/project/templates/manage/widgets.html +++ b/project/templates/manage/widgets.html @@ -29,13 +29,11 @@ +{% if admin_unit.suggestions_enabled %}

    {{ _('Link, um Veranstaltungen vorzuschlagen') }}

    Vorschau

    - -

    {{ _('URL für Infoscreen') }}

    - -

    Vorschau

    +{% endif %} {% endblock %} \ No newline at end of file diff --git a/project/templates/widget/infoscreen/read.html b/project/templates/widget/infoscreen/read.html deleted file mode 100644 index 3024bf5..0000000 --- a/project/templates/widget/infoscreen/read.html +++ /dev/null @@ -1,104 +0,0 @@ -{% extends "layout_widget.html" %} -{% from "_macros.html" import render_location, render_location_prop, render_logo, render_pagination, render_event_warning_pills, render_place, render_events_sub_menu %} -{%- block title -%} -{{ admin_unit.name }} Infoscreen -{%- endblock -%} -{% block styles %} - -{{ super() }} -{% endblock %} -{% block navbar %} -{% endblock %} -{% block managebar %} -{% endblock %} -{% block metas %} - - -{% endblock %} -{% block content_container_attribs %}class="h-100"{% endblock %} -{% block content %} - -
    - -
    -
    -
    - {% if admin_unit.logo_id %} - - {% endif %} -
    -
    -

    Veranstaltungen

    -

    {{ admin_unit.name }}

    -
    -
    -
    - -
    - - -
    - -
    -
    -
    - -
    -
    -
    - MachMit! und trage die Veranstaltungen deines Vereins oder Unternehmens ein! Scanne den QR-Code mit deinem Handy! - -
    -
    -
    - -
    -
    -
    - -
    - -{% endblock %} -{% block footer %} -{% 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 9044faad8a3389e9878b4e8a8f0c92983f6d4261..19e929ea5df6106162900917bc5af19291dda981 100644 GIT binary patch delta 7048 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 aOw9j1_7%;n3e2rt6BrRzd$n{&=zjo9vq3@t delta 6930 zcmZwLeSFX59>?+TY-V@H?kqO5TQ<#@S<|Gsnawh$Wtp3X%~n$ws%$=HPXBv(?9=CaS;=I2XgP!JaR}cb)5lfcIevK8TuU3*N>2&ifR!qimL$fQ2|7Yq1RXU@=A$revIs3guEv!xb2h zucG=NwR$Tuv=hriZ6p`9^8!>Pi_z7@<0xq5HK?7}VI;bkj;m1-*n@1|IfT)87Iief z%&G`PquxtJ^~*+%-Kj(^cmZnSg{TNMB@lm2w2}sO+=^OIGwQ7Np$7iYo}aS%1=K>@ zC3*vgp?25>wUIC=$zD=MVL9#TI06^D6g0pA)LCA^3``nHZs9ngygmB?4)olsZa|!i$vE6 zBpgbzbkvIT%_*o4q6T~ZnAM-N`kPj7K`rg*J2Jo1lY(9tU=N0% z1{{l8&=d^Ddr%Y9V-P-q+Q~}nfa_2@-Gsil8~t!E2IG6?$JTxV-C`b`rl5hcI7oHK zMI}uh24IP`mt!sUJ1`sH!4muh$y;YM2Tz(fb1@5_zyWv=m8|VZ7#&Ffaxt9b4C1fr zGLnWOoQxd5vlX?F4^TV(2;=cfQ<CdLE0KCe$nD3zO{Xz2^)0d1=XyZ_kNI`wy4?;z-6nWK|h3jxeX2jYuEo8PvDhr>KQqz%cw7qcAkb`{YbUy>}Dph|8>AgL>aZ zSD{%+p%Pz3U8k6V-U0?{d3bm2v zQ4x6!6|sY;i2Tbu?NZPV&Y2g@tEi4XH+i`cgeV!MA zP}GLvPzy>yCEE?CqaKM`@OX^W{lA-ncJdJFOqbgW>rn&jwCB66eh`ysKaL8y?+`E4 z5!jV_4^)V6M7@`Xir9425!PZg-iz11|39Ok9h^d~{5w=u|A^cu=V#Q)vj{_f9EJ+% zeb^hfSo;UqgL=DRyn~7S)eft1xeq@!QRDqYm=%#egxSZXkViquF%&h?IMfcRPz$QH zdL1fK_oE*+TKf`n1!`fdQOWl6&5sTBf3=AC>s#y$ z4XJn$dt&S@-p}#j=1feXeJyIiyD$jf!w&cnDj7dVCGk1b&aa}9GH?_h!HfD+;Iqcb9pn9zs2+Dxe-pLiStZ_1not8ig-Xh1oQ{X^cFY>foyR6~FLL9Y zHdKxbz16c3_1->=Vt(gW3LR;PA~UqpBn-pr(H{q+&MY6b)5#c%cVZGQ!Zdu&>i
      ^k;tONeT-6W>jdmVJN zH_q$V8PzYw>M2(5hw7J$t~wS_(2h$`6HY@#ziEN(;%v=8HOKlZ{i z7>!{Qy#HsEhSyVfQSWa@Mdn3}$JbHU**#{3R@8to6D>JVkto1$EWxf=i5h4=M&cuw zi|bJfX+cG%4fS5oByRzcsCrk_xJgJPTqm7^uFH+sAE(+2t57T7fau)^yw0@a}uwSaq39oO3PUD%oW zevHFos58Hcid^^V-)U2WpN7*#^YFw zu~WStkF}`!8q`itqK@KwRKF{zaeStE3yww|St{yz7V0PmO(XsaeIX56z!-a>3UzJn zM(y+gYkv}z3(sH-?m!*cyQoOCpdxo3BQUJe%kmVAr#`~0L2c}Jm9F=_zmEp(rfM|M_t>U_%NP8UB9a7-j~&**n|2uRR8_vXD$T|@GUAt zZDwG#x1&f@dpasoIj9icjEY17D%4|95v)Na;RC2^yBzi9vk4WUL#TzH#zb_(YP^mE zP!km4wE;1SdJT@kChUeSsGVLwqUSzkECyqmZd;kM*Atvbl z|DHlV4bR(yAFw<1R@8OrTI*$RsyWo0h#GJnDnbobUyO>-GIKR*LmN=J^b+cbk6@7Q z|2NkP{Psgu6uQP)9bz zoP^4a`%#|7j0 zppGH}2Ve|_;#eGlQ|kC9Wp4_bXh_Ecn1h#53+Ok81j4cCi)-gJH+5?XZ(iMJM`-i7 znqi5APhcYF&AFbA9>7 Uu;#QGMSc-w|EJTOS=)X83xUQHa{vGU diff --git a/project/translations/de/LC_MESSAGES/messages.po b/project/translations/de/LC_MESSAGES/messages.po index fc96061..1162224 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: 2021-08-15 14:50+0200\n" +"POT-Creation-Date: 2021-08-20 08:42+0200\n" "PO-Revision-Date: 2020-06-07 18:51+0200\n" "Last-Translator: FULL NAME \n" "Language: de\n" @@ -166,24 +166,24 @@ msgstr "Event_" msgid "." msgstr "." -#: project/forms/admin.py:10 project/templates/layout.html:331 +#: project/forms/admin.py:10 project/templates/layout.html:335 #: project/views/root.py:42 msgid "Terms of service" msgstr "Nutzungsbedingungen" -#: project/forms/admin.py:11 project/templates/layout.html:335 +#: project/forms/admin.py:11 project/templates/layout.html:339 #: project/views/root.py:50 msgid "Legal notice" msgstr "Impressum" #: project/forms/admin.py:12 project/templates/_macros.html:1328 -#: project/templates/layout.html:339 +#: project/templates/layout.html:343 #: project/templates/widget/event_suggestion/create.html:199 #: project/views/admin_unit.py:36 project/views/root.py:58 msgid "Contact" msgstr "Kontakt" -#: project/forms/admin.py:13 project/templates/layout.html:343 +#: project/forms/admin.py:13 project/templates/layout.html:347 #: project/views/root.py:66 msgid "Privacy" msgstr "Datenschutz" @@ -214,7 +214,15 @@ msgstr "" "Wenn gesetzt, können andere Organisationen diese Organisation bitten, " "deren Veranstaltungen zu empfehlen." -#: project/forms/admin.py:31 project/templates/admin/update_admin_unit.html:4 +#: project/forms/admin.py:32 +msgid "Suggestions enabled" +msgstr "Vorschläge aktiv" + +#: project/forms/admin.py:33 +msgid "If set, the organization can work with suggestions." +msgstr "Wenn gesetzt, kann die Organisation mit Vorschlägen arbeiten." + +#: project/forms/admin.py:36 project/templates/admin/update_admin_unit.html:4 #: project/templates/admin/update_admin_unit.html:8 msgid "Update organization" msgstr "Organisation aktualisieren" @@ -274,7 +282,7 @@ msgstr "" "eindeutig zu identifizieren. Der Kurzname darf nur Buchstaben, Nummern " "und Unterstriche enthalten." -#: project/forms/admin_unit.py:40 project/templates/_macros.html:1458 +#: project/forms/admin_unit.py:40 project/templates/_macros.html:1464 msgid "Short name must contain only letters numbers or underscore" msgstr "Der Kurzname darf nur Buchstaben, Nummern und Unterstriche enthalten" @@ -288,7 +296,7 @@ msgstr "Link URL" #: project/forms/admin_unit_member.py:23 project/forms/admin_unit_member.py:28 #: project/forms/event.py:58 project/forms/event_suggestion.py:38 #: project/forms/organizer.py:27 project/templates/_macros.html:262 -#: project/templates/_macros.html:1418 project/templates/admin/users.html:19 +#: project/templates/_macros.html:1424 project/templates/admin/users.html:19 msgid "Email" msgstr "Email" @@ -666,7 +674,7 @@ msgstr "Wähle Kategorien, die zur Veranstaltung passen." #: project/forms/event.py:231 project/forms/reference.py:14 #: project/forms/reference.py:27 project/forms/reference_request.py:75 #: project/templates/event/create.html:358 -#: project/templates/event/update.html:214 +#: project/templates/event/update.html:215 msgid "Rating" msgstr "Bewertung" @@ -683,7 +691,7 @@ msgstr "" #: project/forms/event.py:321 project/forms/event_suggestion.py:50 #: project/templates/_macros.html:468 project/templates/_macros.html:624 #: project/templates/event/create.html:283 -#: project/templates/event/update.html:164 +#: project/templates/event/update.html:165 #: project/templates/event_place/create.html:21 #: project/templates/event_place/delete.html:13 #: project/templates/event_place/update.html:21 @@ -702,7 +710,7 @@ msgstr "Neuen Ort eingeben" #: project/forms/event.py:329 project/forms/event.py:389 #: project/forms/event_suggestion.py:60 project/templates/_macros.html:506 #: project/templates/_macros.html:661 project/templates/event/create.html:254 -#: project/templates/event/update.html:155 +#: project/templates/event/update.html:156 #: project/templates/organizer/create.html:17 #: project/templates/organizer/delete.html:13 #: project/templates/organizer/update.html:17 @@ -848,7 +856,7 @@ msgid "Distance" msgstr "Distanz" #: project/forms/event_date.py:30 project/forms/planing.py:34 -#: project/templates/widget/event_date/list.html:42 +#: project/templates/widget/event_date/list.html:53 msgid "Find" msgstr "Finden" @@ -980,7 +988,7 @@ msgstr "Wochentage" #: project/templates/_macros.html:527 project/templates/_macros.html:687 #: project/templates/admin_unit/create.html:19 #: project/templates/admin_unit/update.html:20 -#: project/templates/layout.html:286 +#: project/templates/layout.html:289 msgid "Organization" msgstr "Organisation" @@ -1124,12 +1132,12 @@ msgid "%(count)d event dates" msgstr "%(count)d Termine" #: project/templates/_macros.html:451 project/templates/_macros.html:606 -#: project/templates/_macros.html:1403 project/templates/event/actions.html:32 +#: project/templates/_macros.html:1409 project/templates/event/actions.html:32 msgid "Share" msgstr "Teilen" #: project/templates/_macros.html:455 project/templates/_macros.html:610 -#: project/templates/_macros.html:1433 +#: project/templates/_macros.html:1439 msgid "Add to calendar" msgstr "Zum Kalender" @@ -1225,27 +1233,27 @@ msgstr "Verwende einfach %(term)s" msgid "Event suggestion" msgstr "Veranstaltungsvorschlag" -#: project/templates/_macros.html:1412 +#: project/templates/_macros.html:1418 msgid "Link copied" msgstr "Link kopiert" -#: project/templates/_macros.html:1412 +#: project/templates/_macros.html:1418 msgid "Copy link" msgstr "Link kopieren" -#: project/templates/_macros.html:1441 +#: project/templates/_macros.html:1447 msgid "Google calendar" msgstr "Google Kalender" -#: project/templates/_macros.html:1442 +#: project/templates/_macros.html:1448 msgid "Apple calendar" msgstr "Apple Kalender" -#: project/templates/_macros.html:1443 +#: project/templates/_macros.html:1449 msgid "Yahoo calendar" msgstr "Yahoo Kalender" -#: project/templates/_macros.html:1444 +#: project/templates/_macros.html:1450 msgid "Other calendar" msgstr "Anderer Kalender" @@ -1254,12 +1262,12 @@ msgid "Manage" msgstr "Verwaltung" #: project/templates/home.html:29 project/templates/security/login_user.html:35 -#: project/views/widget.py:180 +#: project/views/widget.py:165 msgid "Register for free" msgstr "Kostenlos registrieren" #: project/templates/event_place/read.html:22 project/templates/layout.html:206 -#: project/templates/layout.html:249 project/templates/manage/events.html:5 +#: project/templates/layout.html:250 project/templates/manage/events.html:5 #: project/templates/manage/events.html:9 msgid "Events" msgstr "Veranstaltungen" @@ -1300,60 +1308,60 @@ msgstr "Administration" msgid "Logout" msgstr "Ausloggen" -#: project/templates/layout.html:255 +#: project/templates/layout.html:256 msgid "Show events" msgstr "Veranstaltungen anzeigen" #: project/templates/event/create.html:4 -#: project/templates/event/create.html:221 project/templates/layout.html:256 +#: project/templates/event/create.html:221 project/templates/layout.html:257 #: project/templates/manage/events.html:12 #: project/templates/manage/organizers.html:21 msgid "Create event" msgstr "Veranstaltung erstellen" -#: project/templates/layout.html:258 +#: project/templates/layout.html:260 msgid "Review suggestions" msgstr "Vorschläge prüfen" -#: project/templates/layout.html:267 +#: project/templates/layout.html:270 #: project/templates/manage/references_incoming.html:5 #: project/templates/manage/references_outgoing.html:5 msgid "References" msgstr "Empfehlungen" -#: project/templates/layout.html:273 +#: project/templates/layout.html:276 #: project/templates/manage/references_incoming.html:9 msgid "Incoming references" msgstr "Eingehende Empfehlungen" -#: project/templates/layout.html:274 +#: project/templates/layout.html:277 #: project/templates/manage/references_outgoing.html:9 msgid "Outgoing references" msgstr "Ausgehende Empfehlungen" -#: project/templates/layout.html:276 +#: project/templates/layout.html:279 #: project/templates/manage/reference_requests_incoming.html:9 msgid "Incoming reference requests" msgstr "Eingehende Empfehlungsanfragen" -#: project/templates/layout.html:281 +#: project/templates/layout.html:284 #: project/templates/manage/reference_requests_outgoing.html:9 msgid "Outgoing reference requests" msgstr "Ausgehende Empfehlungsanfragen" -#: project/templates/layout.html:289 project/templates/manage/organizers.html:5 +#: project/templates/layout.html:292 project/templates/manage/organizers.html:5 #: project/templates/manage/organizers.html:9 msgid "Organizers" msgstr "Veranstalter" #: project/templates/event_place/list.html:3 -#: project/templates/event_place/list.html:7 project/templates/layout.html:290 +#: project/templates/event_place/list.html:7 project/templates/layout.html:293 #: project/templates/manage/places.html:5 #: project/templates/manage/places.html:9 msgid "Places" msgstr "Orte" -#: project/templates/layout.html:292 project/templates/manage/members.html:5 +#: project/templates/layout.html:295 project/templates/manage/members.html:5 #: project/templates/manage/members.html:28 msgid "Members" msgstr "Mitglieder" @@ -1362,22 +1370,22 @@ msgstr "Mitglieder" #: project/templates/admin/settings.html:4 #: project/templates/admin/settings.html:8 #: project/templates/admin_unit/update.html:14 -#: project/templates/layout.html:293 project/templates/manage/widgets.html:12 +#: project/templates/layout.html:296 project/templates/manage/widgets.html:12 #: project/templates/profile.html:19 msgid "Settings" msgstr "Einstellungen" -#: project/templates/layout.html:294 project/templates/manage/reviews.html:10 +#: project/templates/layout.html:297 project/templates/manage/reviews.html:10 #: project/templates/manage/widgets.html:5 #: project/templates/manage/widgets.html:9 msgid "Widgets" msgstr "Widgets" -#: project/templates/layout.html:304 +#: project/templates/layout.html:307 msgid "Switch organization" msgstr "Organisation wechseln" -#: project/templates/developer/read.html:4 project/templates/layout.html:353 +#: project/templates/developer/read.html:4 project/templates/layout.html:357 #: project/templates/profile.html:29 msgid "Developer" msgstr "Entwickler" @@ -1418,7 +1426,7 @@ msgstr "Bearbeiten" #: project/templates/admin_unit/create.html:49 #: project/templates/admin_unit/update.html:50 #: project/templates/event/create.html:346 -#: project/templates/event/update.html:202 +#: project/templates/event/update.html:203 #: project/templates/event_place/create.html:47 #: project/templates/event_place/update.html:47 #: project/templates/organizer/create.html:46 @@ -1551,12 +1559,12 @@ msgid "Switch to place search" msgstr "Zur Ortssuche wechseln" #: project/templates/event/create.html:319 -#: project/templates/event/update.html:175 +#: project/templates/event/update.html:176 msgid "Access" msgstr "Zugang" #: project/templates/event/create.html:333 -#: project/templates/event/update.html:189 +#: project/templates/event/update.html:190 msgid "Target group" msgstr "Zielgruppe" @@ -1665,14 +1673,10 @@ msgstr "Prüfungen" msgid "Veranstaltungen als iFrame einbetten" msgstr "Veranstaltungen als iFrame einbetten" -#: project/templates/manage/widgets.html:32 +#: project/templates/manage/widgets.html:33 msgid "Link, um Veranstaltungen vorzuschlagen" msgstr "Link, um Veranstaltungen vorzuschlagen" -#: project/templates/manage/widgets.html:36 -msgid "URL für Infoscreen" -msgstr "URL für Infoscreen" - #: project/templates/oauth2_client/create.html:4 #: project/templates/oauth2_client/create.html:8 #: project/templates/oauth2_client/list.html:17 @@ -1767,7 +1771,7 @@ msgstr "Du hast noch keinen Account? Kein Problem!" msgid "Widget" msgstr "Widget" -#: project/templates/widget/event_date/list.html:105 +#: project/templates/widget/event_date/list.html:116 msgid "Print" msgstr "Drucken" @@ -1787,7 +1791,7 @@ msgstr "Vorschau" msgid "Organization successfully updated" msgstr "Organisation erfolgreich aktualisiert" -#: project/views/admin.py:68 project/views/manage.py:260 +#: project/views/admin.py:68 project/views/manage.py:270 msgid "Settings successfully updated" msgstr "Einstellungen erfolgreich aktualisiert" @@ -2006,11 +2010,11 @@ msgstr "Anzeigen" msgid "You do not have permission for this action" msgstr "Du hast keine Berechtigung für diese Aktion" -#: project/views/widget.py:172 +#: project/views/widget.py:157 msgid "Thank you so much! The event is being verified." msgstr "Vielen Dank! Die Veranstaltung wird geprüft." -#: project/views/widget.py:176 +#: project/views/widget.py:161 msgid "" "For more options and your own calendar of events, you can register for " "free." @@ -2018,7 +2022,7 @@ msgstr "" "Für mehr Optionen und einen eigenen Veranstaltungskalender, kannst du " "dich kostenlos registrieren." -#: project/views/widget.py:239 +#: project/views/widget.py:224 msgid "New event review" msgstr "Neue Veranstaltung zu prüfen" @@ -2053,3 +2057,6 @@ msgstr "Neue Veranstaltung zu prüfen" #~ msgid "Draft" #~ msgstr "Entwurf" +#~ msgid "URL für Infoscreen" +#~ msgstr "URL für Infoscreen" + diff --git a/project/translations/en/LC_MESSAGES/messages.mo b/project/translations/en/LC_MESSAGES/messages.mo index 5f8283b595282fa9bf6c595f58e5a485b5cf96eb..5be7520fb70517ea10ee31d0a1dd76482de28e69 100644 GIT binary patch delta 21 dcmbO!Ia6}OBMuHD0|f&MD-)y5uQ=8-0{~5R2Iv3) delta 21 dcmbO!Ia6}OBMuHjQw2j4D^r8buQ=8-0{~5h2Iv3) diff --git a/project/translations/en/LC_MESSAGES/messages.po b/project/translations/en/LC_MESSAGES/messages.po index 59eb1aa..218ca12 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: 2021-08-15 14:50+0200\n" +"POT-Creation-Date: 2021-08-20 08:42+0200\n" "PO-Revision-Date: 2021-04-30 15:04+0200\n" "Last-Translator: FULL NAME \n" "Language: en\n" @@ -166,24 +166,24 @@ msgstr "" msgid "." msgstr "" -#: project/forms/admin.py:10 project/templates/layout.html:331 +#: project/forms/admin.py:10 project/templates/layout.html:335 #: project/views/root.py:42 msgid "Terms of service" msgstr "" -#: project/forms/admin.py:11 project/templates/layout.html:335 +#: project/forms/admin.py:11 project/templates/layout.html:339 #: project/views/root.py:50 msgid "Legal notice" msgstr "" #: project/forms/admin.py:12 project/templates/_macros.html:1328 -#: project/templates/layout.html:339 +#: project/templates/layout.html:343 #: project/templates/widget/event_suggestion/create.html:199 #: project/views/admin_unit.py:36 project/views/root.py:58 msgid "Contact" msgstr "" -#: project/forms/admin.py:13 project/templates/layout.html:343 +#: project/forms/admin.py:13 project/templates/layout.html:347 #: project/views/root.py:66 msgid "Privacy" msgstr "" @@ -212,7 +212,15 @@ msgid "" "event." msgstr "" -#: project/forms/admin.py:31 project/templates/admin/update_admin_unit.html:4 +#: project/forms/admin.py:32 +msgid "Suggestions enabled" +msgstr "" + +#: project/forms/admin.py:33 +msgid "If set, the organization can work with suggestions." +msgstr "" + +#: project/forms/admin.py:36 project/templates/admin/update_admin_unit.html:4 #: project/templates/admin/update_admin_unit.html:8 msgid "Update organization" msgstr "" @@ -269,7 +277,7 @@ msgstr "" msgid "The short name is used to create a unique identifier for your events" msgstr "" -#: project/forms/admin_unit.py:40 project/templates/_macros.html:1458 +#: project/forms/admin_unit.py:40 project/templates/_macros.html:1464 msgid "Short name must contain only letters numbers or underscore" msgstr "" @@ -283,7 +291,7 @@ msgstr "" #: project/forms/admin_unit_member.py:23 project/forms/admin_unit_member.py:28 #: project/forms/event.py:58 project/forms/event_suggestion.py:38 #: project/forms/organizer.py:27 project/templates/_macros.html:262 -#: project/templates/_macros.html:1418 project/templates/admin/users.html:19 +#: project/templates/_macros.html:1424 project/templates/admin/users.html:19 msgid "Email" msgstr "" @@ -643,7 +651,7 @@ msgstr "" #: project/forms/event.py:231 project/forms/reference.py:14 #: project/forms/reference.py:27 project/forms/reference_request.py:75 #: project/templates/event/create.html:358 -#: project/templates/event/update.html:214 +#: project/templates/event/update.html:215 msgid "Rating" msgstr "" @@ -658,7 +666,7 @@ msgstr "" #: project/forms/event.py:321 project/forms/event_suggestion.py:50 #: project/templates/_macros.html:468 project/templates/_macros.html:624 #: project/templates/event/create.html:283 -#: project/templates/event/update.html:164 +#: project/templates/event/update.html:165 #: project/templates/event_place/create.html:21 #: project/templates/event_place/delete.html:13 #: project/templates/event_place/update.html:21 @@ -677,7 +685,7 @@ msgstr "" #: project/forms/event.py:329 project/forms/event.py:389 #: project/forms/event_suggestion.py:60 project/templates/_macros.html:506 #: project/templates/_macros.html:661 project/templates/event/create.html:254 -#: project/templates/event/update.html:155 +#: project/templates/event/update.html:156 #: project/templates/organizer/create.html:17 #: project/templates/organizer/delete.html:13 #: project/templates/organizer/update.html:17 @@ -819,7 +827,7 @@ msgid "Distance" msgstr "" #: project/forms/event_date.py:30 project/forms/planing.py:34 -#: project/templates/widget/event_date/list.html:42 +#: project/templates/widget/event_date/list.html:53 msgid "Find" msgstr "" @@ -947,7 +955,7 @@ msgstr "" #: project/templates/_macros.html:527 project/templates/_macros.html:687 #: project/templates/admin_unit/create.html:19 #: project/templates/admin_unit/update.html:20 -#: project/templates/layout.html:286 +#: project/templates/layout.html:289 msgid "Organization" msgstr "" @@ -1091,12 +1099,12 @@ msgid "%(count)d event dates" msgstr "" #: project/templates/_macros.html:451 project/templates/_macros.html:606 -#: project/templates/_macros.html:1403 project/templates/event/actions.html:32 +#: project/templates/_macros.html:1409 project/templates/event/actions.html:32 msgid "Share" msgstr "" #: project/templates/_macros.html:455 project/templates/_macros.html:610 -#: project/templates/_macros.html:1433 +#: project/templates/_macros.html:1439 msgid "Add to calendar" msgstr "" @@ -1190,27 +1198,27 @@ msgstr "" msgid "Event suggestion" msgstr "" -#: project/templates/_macros.html:1412 +#: project/templates/_macros.html:1418 msgid "Link copied" msgstr "" -#: project/templates/_macros.html:1412 +#: project/templates/_macros.html:1418 msgid "Copy link" msgstr "" -#: project/templates/_macros.html:1441 +#: project/templates/_macros.html:1447 msgid "Google calendar" msgstr "" -#: project/templates/_macros.html:1442 +#: project/templates/_macros.html:1448 msgid "Apple calendar" msgstr "" -#: project/templates/_macros.html:1443 +#: project/templates/_macros.html:1449 msgid "Yahoo calendar" msgstr "" -#: project/templates/_macros.html:1444 +#: project/templates/_macros.html:1450 msgid "Other calendar" msgstr "" @@ -1219,12 +1227,12 @@ msgid "Manage" msgstr "" #: project/templates/home.html:29 project/templates/security/login_user.html:35 -#: project/views/widget.py:180 +#: project/views/widget.py:165 msgid "Register for free" msgstr "" #: project/templates/event_place/read.html:22 project/templates/layout.html:206 -#: project/templates/layout.html:249 project/templates/manage/events.html:5 +#: project/templates/layout.html:250 project/templates/manage/events.html:5 #: project/templates/manage/events.html:9 msgid "Events" msgstr "" @@ -1265,60 +1273,60 @@ msgstr "" msgid "Logout" msgstr "" -#: project/templates/layout.html:255 +#: project/templates/layout.html:256 msgid "Show events" msgstr "" #: project/templates/event/create.html:4 -#: project/templates/event/create.html:221 project/templates/layout.html:256 +#: project/templates/event/create.html:221 project/templates/layout.html:257 #: project/templates/manage/events.html:12 #: project/templates/manage/organizers.html:21 msgid "Create event" msgstr "" -#: project/templates/layout.html:258 +#: project/templates/layout.html:260 msgid "Review suggestions" msgstr "" -#: project/templates/layout.html:267 +#: project/templates/layout.html:270 #: project/templates/manage/references_incoming.html:5 #: project/templates/manage/references_outgoing.html:5 msgid "References" msgstr "" -#: project/templates/layout.html:273 +#: project/templates/layout.html:276 #: project/templates/manage/references_incoming.html:9 msgid "Incoming references" msgstr "" -#: project/templates/layout.html:274 +#: project/templates/layout.html:277 #: project/templates/manage/references_outgoing.html:9 msgid "Outgoing references" msgstr "" -#: project/templates/layout.html:276 +#: project/templates/layout.html:279 #: project/templates/manage/reference_requests_incoming.html:9 msgid "Incoming reference requests" msgstr "" -#: project/templates/layout.html:281 +#: project/templates/layout.html:284 #: project/templates/manage/reference_requests_outgoing.html:9 msgid "Outgoing reference requests" msgstr "" -#: project/templates/layout.html:289 project/templates/manage/organizers.html:5 +#: project/templates/layout.html:292 project/templates/manage/organizers.html:5 #: project/templates/manage/organizers.html:9 msgid "Organizers" msgstr "" #: project/templates/event_place/list.html:3 -#: project/templates/event_place/list.html:7 project/templates/layout.html:290 +#: project/templates/event_place/list.html:7 project/templates/layout.html:293 #: project/templates/manage/places.html:5 #: project/templates/manage/places.html:9 msgid "Places" msgstr "" -#: project/templates/layout.html:292 project/templates/manage/members.html:5 +#: project/templates/layout.html:295 project/templates/manage/members.html:5 #: project/templates/manage/members.html:28 msgid "Members" msgstr "" @@ -1327,22 +1335,22 @@ msgstr "" #: project/templates/admin/settings.html:4 #: project/templates/admin/settings.html:8 #: project/templates/admin_unit/update.html:14 -#: project/templates/layout.html:293 project/templates/manage/widgets.html:12 +#: project/templates/layout.html:296 project/templates/manage/widgets.html:12 #: project/templates/profile.html:19 msgid "Settings" msgstr "" -#: project/templates/layout.html:294 project/templates/manage/reviews.html:10 +#: project/templates/layout.html:297 project/templates/manage/reviews.html:10 #: project/templates/manage/widgets.html:5 #: project/templates/manage/widgets.html:9 msgid "Widgets" msgstr "" -#: project/templates/layout.html:304 +#: project/templates/layout.html:307 msgid "Switch organization" msgstr "" -#: project/templates/developer/read.html:4 project/templates/layout.html:353 +#: project/templates/developer/read.html:4 project/templates/layout.html:357 #: project/templates/profile.html:29 msgid "Developer" msgstr "" @@ -1383,7 +1391,7 @@ msgstr "" #: project/templates/admin_unit/create.html:49 #: project/templates/admin_unit/update.html:50 #: project/templates/event/create.html:346 -#: project/templates/event/update.html:202 +#: project/templates/event/update.html:203 #: project/templates/event_place/create.html:47 #: project/templates/event_place/update.html:47 #: project/templates/organizer/create.html:46 @@ -1514,12 +1522,12 @@ msgid "Switch to place search" msgstr "" #: project/templates/event/create.html:319 -#: project/templates/event/update.html:175 +#: project/templates/event/update.html:176 msgid "Access" msgstr "" #: project/templates/event/create.html:333 -#: project/templates/event/update.html:189 +#: project/templates/event/update.html:190 msgid "Target group" msgstr "" @@ -1628,14 +1636,10 @@ msgstr "" msgid "Veranstaltungen als iFrame einbetten" msgstr "" -#: project/templates/manage/widgets.html:32 +#: project/templates/manage/widgets.html:33 msgid "Link, um Veranstaltungen vorzuschlagen" msgstr "" -#: project/templates/manage/widgets.html:36 -msgid "URL für Infoscreen" -msgstr "" - #: project/templates/oauth2_client/create.html:4 #: project/templates/oauth2_client/create.html:8 #: project/templates/oauth2_client/list.html:17 @@ -1730,7 +1734,7 @@ msgstr "" msgid "Widget" msgstr "" -#: project/templates/widget/event_date/list.html:105 +#: project/templates/widget/event_date/list.html:116 msgid "Print" msgstr "" @@ -1750,7 +1754,7 @@ msgstr "" msgid "Organization successfully updated" msgstr "" -#: project/views/admin.py:68 project/views/manage.py:260 +#: project/views/admin.py:68 project/views/manage.py:270 msgid "Settings successfully updated" msgstr "" @@ -1962,17 +1966,17 @@ msgstr "" msgid "You do not have permission for this action" msgstr "" -#: project/views/widget.py:172 +#: project/views/widget.py:157 msgid "Thank you so much! The event is being verified." msgstr "" -#: project/views/widget.py:176 +#: project/views/widget.py:161 msgid "" "For more options and your own calendar of events, you can register for " "free." msgstr "" -#: project/views/widget.py:239 +#: project/views/widget.py:224 msgid "New event review" msgstr "" @@ -2002,3 +2006,6 @@ msgstr "" #~ msgid "Draft" #~ msgstr "" +#~ msgid "URL für Infoscreen" +#~ msgstr "" + diff --git a/project/views/manage.py b/project/views/manage.py index a493c42..4c075ef 100644 --- a/project/views/manage.py +++ b/project/views/manage.py @@ -6,6 +6,7 @@ from sqlalchemy.sql import desc, func from project import app, db from project.access import ( + admin_unit_suggestions_enabled_or_404, get_admin_unit_for_manage, get_admin_unit_for_manage_or_404, get_admin_units_for_manage, @@ -101,6 +102,7 @@ def manage_admin_unit(id): @auth_required() def manage_admin_unit_event_reviews(id): admin_unit = get_admin_unit_for_manage_or_404(id) + admin_unit_suggestions_enabled_or_404(admin_unit) event_suggestions_paginate = ( get_event_reviews_query(admin_unit) diff --git a/project/views/widget.py b/project/views/widget.py index db53176..6bb19c3 100644 --- a/project/views/widget.py +++ b/project/views/widget.py @@ -7,7 +7,11 @@ from sqlalchemy.exc import SQLAlchemyError from sqlalchemy.sql import func from project import app, db -from project.access import can_read_event_or_401, has_admin_unit_member_permission +from project.access import ( + admin_unit_suggestions_enabled_or_404, + can_read_event_or_401, + has_admin_unit_member_permission, +) from project.dateutils import get_next_full_hour from project.forms.event_date import FindEventDateForm from project.forms.event_suggestion import CreateEventSuggestionForm @@ -74,6 +78,7 @@ def widget_event_date(au_short_name, id): admin_unit = AdminUnit.query.filter( AdminUnit.short_name == au_short_name ).first_or_404() + event_date = get_event_date_with_details_or_404(id) can_read_event_or_401(event_date.event) structured_data = json.dumps( @@ -94,27 +99,6 @@ def widget_event_date(au_short_name, id): ) -@app.route("//widget/infoscreen") -def widget_infoscreen(au_short_name): - admin_unit = AdminUnit.query.filter( - AdminUnit.short_name == au_short_name - ).first_or_404() - - params = EventSearchParams() - params.load_from_request() - params.admin_unit_id = admin_unit.id - - dates = get_event_dates_query(params).paginate(max_per_page=5) - - return render_template( - "widget/infoscreen/read.html", - admin_unit=admin_unit, - params=params, - styles=get_styles(admin_unit), - dates=dates.items, - ) - - @app.route( "//widget/event_suggestions/create", methods=("GET", "POST") ) @@ -122,6 +106,7 @@ def event_suggestion_create_for_admin_unit(au_short_name): admin_unit = AdminUnit.query.filter( AdminUnit.short_name == au_short_name ).first_or_404() + admin_unit_suggestions_enabled_or_404(admin_unit) form = CreateEventSuggestionForm() diff --git a/tests/api/test_event_date.py b/tests/api/test_event_date.py index 0222ee2..1e0d732 100644 --- a/tests/api/test_event_date.py +++ b/tests/api/test_event_date.py @@ -57,3 +57,7 @@ def test_search(client, seeder, utils): "api_v1_event_date_search", coordinate="51.9077888,10.4333312", distance=500 ) response = utils.get_ok(url) + + organizer_id = seeder.upsert_default_event_organizer(admin_unit_id) + url = utils.get_url("api_v1_event_date_search", organizer_id=organizer_id) + response = utils.get_ok(url) diff --git a/tests/seeder.py b/tests/seeder.py index 4c8339a..14f97e4 100644 --- a/tests/seeder.py +++ b/tests/seeder.py @@ -44,7 +44,7 @@ class Seeder(object): return user_id - def create_admin_unit(self, user_id, name="Meine Crew"): + def create_admin_unit(self, user_id, name="Meine Crew", suggestions_enabled=True): from project.models import AdminUnit from project.services.admin_unit import insert_admin_unit_for_user from project.services.user import get_user @@ -55,6 +55,7 @@ class Seeder(object): admin_unit.name = name admin_unit.short_name = name.lower().replace(" ", "") admin_unit.incoming_reference_requests_allowed = True + admin_unit.suggestions_enabled = suggestions_enabled insert_admin_unit_for_user(admin_unit, user) self._db.session.commit() admin_unit_id = admin_unit.id diff --git a/tests/views/test_admin.py b/tests/views/test_admin.py index e995262..d8b94f2 100644 --- a/tests/views/test_admin.py +++ b/tests/views/test_admin.py @@ -118,6 +118,7 @@ def test_admin_admin_unit_update(client, seeder, utils, app, mocker, db, db_erro admin_unit = AdminUnit.query.get_or_404(admin_unit_id) admin_unit.incoming_reference_requests_allowed = False + admin_unit.suggestions_enabled = False db.session.commit() url = utils.get_url("admin_admin_unit_update", id=admin_unit_id) @@ -131,6 +132,7 @@ def test_admin_admin_unit_update(client, seeder, utils, app, mocker, db, db_erro response, { "incoming_reference_requests_allowed": "y", + "suggestions_enabled": "y", }, ) @@ -145,3 +147,4 @@ def test_admin_admin_unit_update(client, seeder, utils, app, mocker, db, db_erro admin_unit = AdminUnit.query.get_or_404(admin_unit_id) assert admin_unit.incoming_reference_requests_allowed + assert admin_unit.suggestions_enabled diff --git a/tests/views/test_widget.py b/tests/views/test_widget.py index 0eafabd..29f9c41 100644 --- a/tests/views/test_widget.py +++ b/tests/views/test_widget.py @@ -69,21 +69,6 @@ def test_event_date(client, seeder, utils, app, db): utils.assert_response_unauthorized(response) -def test_infoscreen(client, seeder, utils): - user_id, admin_unit_id = seeder.setup_base() - seeder.create_event(admin_unit_id) - au_short_name = "meinecrew" - - url = utils.get_url("widget_infoscreen", au_short_name=au_short_name) - utils.get_ok(url) - - organizer_id = seeder.upsert_default_event_organizer(admin_unit_id) - url = utils.get_url( - "widget_infoscreen", au_short_name=au_short_name, organizer_id=organizer_id - ) - utils.get_ok(url) - - def get_create_data(): return { "accept_tos": "y", @@ -225,3 +210,15 @@ def test_event_suggestion_create_for_admin_unit_invalidEventPlaceId( data, ) assert response.status_code == 302 + + +def test_event_suggestion_create_for_admin_unit_notEnabled(client, app, seeder, utils): + user_id = seeder.create_user() + seeder.create_admin_unit(user_id, "Meine Crew", suggestions_enabled=False) + au_short_name = "meinecrew" + + url = utils.get_url( + "event_suggestion_create_for_admin_unit", au_short_name=au_short_name + ) + response = utils.get(url) + utils.assert_response_notFound(response)