allow user exports with s3

also undoes a line space change in settings.py to make the PR cleaner
This commit is contained in:
Hugh Rundle 2024-01-29 13:45:35 +11:00
parent 765fc1e43d
commit adff3c4251
No known key found for this signature in database
GPG key ID: A7E35779918253F9
2 changed files with 2 additions and 4 deletions

View file

@ -442,4 +442,5 @@ if HTTP_X_FORWARDED_PROTO:
# Do not change this setting unless you already have an existing # Do not change this setting unless you already have an existing
# user with the same username - in which case you should change it! # user with the same username - in which case you should change it!
INSTANCE_ACTOR_USERNAME = "bookwyrm.instance.actor" INSTANCE_ACTOR_USERNAME = "bookwyrm.instance.actor"
DATA_UPLOAD_MAX_MEMORY_SIZE = env.int("DATA_UPLOAD_MAX_MEMORY_SIZE", (1024**2 * 100)) DATA_UPLOAD_MAX_MEMORY_SIZE = env.int("DATA_UPLOAD_MAX_MEMORY_SIZE", (1024**2 * 100))

View file

@ -157,13 +157,10 @@
> >
<div class="notification is-danger is-light"> <div class="notification is-danger is-light">
<p class="my-2">{% trans "Users are currently unable to start new user exports. This is the default setting." %}</p> <p class="my-2">{% trans "Users are currently unable to start new user exports. This is the default setting." %}</p>
{% if use_s3 %}
<p>{% trans "It is not currently possible to provide user exports when using s3 storage. The BookWyrm development team are working on a fix for this." %}</p>
{% endif %}
</div> </div>
{% csrf_token %} {% csrf_token %}
<div class="control"> <div class="control">
<button type="submit" class="button is-success" {% if use_s3 %}disabled{% endif %}> <button type="submit" class="button is-success">
{% trans "Enable user exports" %} {% trans "Enable user exports" %}
</button> </button>
</div> </div>