From 204b8e53deeccc2709e08a13caf64145bdb0a4af Mon Sep 17 00:00:00 2001 From: Mira Weller Date: Thu, 11 Apr 2024 18:35:41 +0200 Subject: [PATCH] Changes from review --- src/pretix/base/models/orders.py | 4 ++-- src/pretix/base/timemachine.py | 14 +------------- src/pretix/control/views/event.py | 4 +--- .../templates/pretixpresale/event/base.html | 8 ++++---- src/pretix/static/pretixpresale/scss/_event.scss | 6 +++--- 5 files changed, 11 insertions(+), 25 deletions(-) diff --git a/src/pretix/base/models/orders.py b/src/pretix/base/models/orders.py index 94430e242..8bcdb7c66 100644 --- a/src/pretix/base/models/orders.py +++ b/src/pretix/base/models/orders.py @@ -504,7 +504,7 @@ class Order(LockModel, LoggedModel): if 'update_fields' in kwargs: kwargs['update_fields'] = {'code'}.union(kwargs['update_fields']) if not self.datetime: - self.datetime = time_machine_now() + self.datetime = now() if 'update_fields' in kwargs: kwargs['update_fields'] = {'datetime'}.union(kwargs['update_fields']) if not self.expires: @@ -541,7 +541,7 @@ class Order(LockModel, LoggedModel): self.save(update_fields=['last_modified']) def set_expires(self, now_dt=None, subevents=None): - now_dt = now_dt or time_machine_now() + now_dt = now_dt or now() tz = ZoneInfo(self.event.settings.timezone) mode = self.event.settings.get('payment_term_mode') if mode == 'days': diff --git a/src/pretix/base/timemachine.py b/src/pretix/base/timemachine.py index 87cdeb2c8..2ff819257 100644 --- a/src/pretix/base/timemachine.py +++ b/src/pretix/base/timemachine.py @@ -20,18 +20,6 @@ # . # -# This file is based on an earlier version of pretix which was released under the Apache License 2.0. The full text of -# the Apache License 2.0 can be obtained at . -# -# This file may have since been changed and any changes are released under the terms of AGPLv3 as described above. A -# full history of changes and contributors is available at . -# -# This file contains Apache-licensed contributions copyrighted by: Tobias Kunze -# -# Unless required by applicable law or agreed to in writing, software distributed under the Apache License 2.0 is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations under the License. - import threading from contextlib import contextmanager @@ -47,7 +35,7 @@ class TimeMachineMiddleware: super().__init__() def __call__(self, request): - if hasattr(request, 'event') and hasattr(request, '_namespace') and request._namespace == 'presale' and \ + if hasattr(request, 'event') and hasattr(request, '_namespace') and hasattr(request, '_event_detected') and \ 'timemachine_now_dt' in request.session and \ request.event.testmode and request.user.is_authenticated and \ request.user.has_event_permission(request.organizer, request.event, 'can_change_event_settings', request): diff --git a/src/pretix/control/views/event.py b/src/pretix/control/views/event.py index 9609f19de..b48f4e9df 100644 --- a/src/pretix/control/views/event.py +++ b/src/pretix/control/views/event.py @@ -91,9 +91,7 @@ from pretix.control.permissions import EventPermissionRequiredMixin from pretix.control.views.mailsetup import MailSettingsSetupView from pretix.control.views.user import RecentAuthenticationRequiredMixin from pretix.helpers.database import rolledback_transaction -from pretix.multidomain.urlreverse import ( - build_absolute_uri, get_event_domain, -) +from pretix.multidomain.urlreverse import build_absolute_uri, get_event_domain from pretix.plugins.stripe.payment import StripeSettingsHolder from pretix.presale.style import regenerate_css diff --git a/src/pretix/presale/templates/pretixpresale/event/base.html b/src/pretix/presale/templates/pretixpresale/event/base.html index b0dfef7b7..c1c7f6d86 100644 --- a/src/pretix/presale/templates/pretixpresale/event/base.html +++ b/src/pretix/presale/templates/pretixpresale/event/base.html @@ -37,10 +37,10 @@
- {% trans "You are currently using the time machine. The ticket shop is rendered as if it were" %} {{ request.now_dt }} - - {% trans "Change" %} - + {% blocktrans trimmed with datetime=request.now_dt|date:"SHORT_DATETIME_FORMAT" %} + You are currently using the time machine. The ticket shop is rendered as if it were {{ datetime }}. + {% endblocktrans %} + {% trans "Change" %}
{% csrf_token %} diff --git a/src/pretix/static/pretixpresale/scss/_event.scss b/src/pretix/static/pretixpresale/scss/_event.scss index 19ea2ef8e..6767527a7 100644 --- a/src/pretix/static/pretixpresale/scss/_event.scss +++ b/src/pretix/static/pretixpresale/scss/_event.scss @@ -188,18 +188,18 @@ div.front-page { margin-top: 30px; } .offline-banner, .timemachine-banner { - color: white; width: 100%; padding: 5px; text-align: center; a, .btn-link { text-decoration: underline; - color: white; } } -.offline-banner { background: $brand-danger; } +.offline-banner { background: $brand-danger; color: white; } +.offline-banner a { color: white; } .timemachine-banner { background: $brand-warning; } +.timemachine-banner a, .timemachine-banner .btn-link { color: $text-color; } #questions_group .panel-title a { line-height: 22px; }