Skip to content

Commit

Permalink
Fix docker build - Internal error (fossasia#410)
Browse files Browse the repository at this point in the history
* upgrade django version from 4.2 to 5.1

* Fix Dockerfile and isort in pipeline

* Fix Dockerfile in pipeline

* reverse docker change

* fix docker build

* fix missing static import

---------

Co-authored-by: Mario Behling <[email protected]>
Co-authored-by: lcduong <lcduong>
  • Loading branch information
lcduong and mariobehling authored Oct 26, 2024
1 parent 5e9f024 commit ddd2674
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 31 deletions.
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ RUN chmod +x /usr/local/bin/pretix && \
cd /pretix/src && \
rm -f pretix.cfg && \
mkdir -p data && \
chown -R pretixuser:pretixuser /pretix /data data
chown -R pretixuser:pretixuser /pretix /data data && \
sudo -u pretixuser make production

USER pretixuser
VOLUME ["/etc/pretix", "/data"]
Expand Down
67 changes: 38 additions & 29 deletions src/pretix/control/templates/pretixcontrol/organizers/delete.html
Original file line number Diff line number Diff line change
@@ -1,42 +1,51 @@
{% extends "pretixcontrol/organizers/base.html" %} {% load i18n %} {% load
bootstrap3 %} {% block content %}
{% extends "pretixcontrol/organizers/base.html" %}
{% load i18n %}
{% load bootstrap3 %}
{% block content %}
<h1>{% trans "Delete organizer" %}</h1>
{% if request.organizer.allow_delete %} {% bootstrap_form_errors form
layout="inline" %}
{% if request.organizer.allow_delete %}
{% bootstrap_form_errors form layout="inline" %}
<p>
{% blocktrans trimmed %} This operation will destroy this organizer including
all events, configuration, products, quotas, questions, vouchers, lists, etc.
{% endblocktrans %}
{% blocktrans trimmed %}
This operation will destroy this organizer including
all events, configuration, products, quotas, questions, vouchers, lists, etc.
{% endblocktrans %}
</p>
<p>
<strong>
{% blocktrans trimmed %} This operation is irreversible and there is no way
to bring your data back. {% endblocktrans %}
</strong>
<strong>
{% blocktrans trimmed %}
This operation is irreversible and there is no way
to bring your data back.
{% endblocktrans %}
</strong>
</p>
<form action="" method="post">
{% csrf_token %}
<p>
{% blocktrans trimmed with slug=request.organizer.slug %} To confirm you
really want this, please type out the organizer's short name ("{{ slug }}")
here: {% endblocktrans %}
</p>
{% bootstrap_field form.slug layout="inline" %}
{% csrf_token %}
<p>
{% blocktrans trimmed with slug=request.organizer.slug %}
To confirm you really want this, please type out the organizer's short name ("{{ slug }}")
here:
{% endblocktrans %}
</p>
{% bootstrap_field form.slug layout="inline" %}

<div class="form-group submit-group">
<button type="submit" class="btn btn-delete btn-danger btn-save">
{% trans "Delete" %}
</button>
</div>
<div class="form-group submit-group">
<button type="submit" class="btn btn-delete btn-danger btn-save">
{% trans "Delete" %}
</button>
</div>
</form>
{% else %}
<p>
{% trans "This organizer account can not be deleted as it already contains
orders, invoices, or devices." %}
{% trans "This organizer account can not be deleted as it already contains
orders, invoices, or devices." %}
</p>
<p>
{% blocktrans trimmed %} eventyay does not allow deleting orders once they
have been placed in order to be audit-proof and trustable by financial
authorities. {% endblocktrans %}
{% blocktrans trimmed %}
eventyay does not allow deleting orders once they
have been placed in order to be audit-proof and trustable by financial
authorities.
{% endblocktrans %}
</p>
{% endif %} {% endblock %}
{% endif %}
{% endblock %}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<script type="text/javascript" src="{% static "pretixpresale/js/widget/floatformat.js" %}"></script>
<script type="text/javascript" src="{% static "pretixpresale/js/ui/questions.js" %}"></script>
<script type="text/javascript" src="{% static "pretixpresale/js/ui/main.js" %}"></script>
<script type="text/javascript" src="{% static "pretixpresale/js/ui/sso-popup.js" %}"></script>
<script type="text/javascript" src="{% static "pretixbase/js/asynctask.js" %}"></script>
<script type="text/javascript" src="{% static "pretixpresale/js/ui/cart.js" %}"></script>
<script type="text/javascript" src="{% static "lightbox/js/lightbox.min.js" %}"></script>
Expand Down

0 comments on commit ddd2674

Please sign in to comment.