diff --git a/.github/workflows/django-tests.yml b/.github/workflows/django-tests.yml index 4968b40cf..00e08dadb 100644 --- a/.github/workflows/django-tests.yml +++ b/.github/workflows/django-tests.yml @@ -47,7 +47,7 @@ jobs: CELERY_BROKER: "" REDIS_BROKER_PORT: 6379 REDIS_BROKER_PASSWORD: beep - USE_LOCAL_CACHE: true + USE_DUMMY_CACHE: true FLOWER_PORT: 8888 EMAIL_HOST: "smtp.mailgun.org" EMAIL_PORT: 587 diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 57717fb99..5b69e3782 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -120,7 +120,13 @@ STREAMS = [ ] # Redis cache backend -if not env("USE_LOCAL_CACHE", False): +if env("USE_DUMMY_CACHE", False): + CACHES = { + "default": { + "BACKEND": "django.core.cache.backends.dummy.DummyCache", + } + } +else: # pylint: disable=line-too-long CACHES = { "default": { diff --git a/bookwyrm/templates/directory/sort_filter.html b/bookwyrm/templates/directory/sort_filter.html index c7c19f6fe..344366016 100644 --- a/bookwyrm/templates/directory/sort_filter.html +++ b/bookwyrm/templates/directory/sort_filter.html @@ -3,10 +3,12 @@ {% block filter %} -
- +
+
+ +
{% endblock %} diff --git a/bookwyrm/templates/settings/users/server_filter.html b/bookwyrm/templates/settings/users/server_filter.html index 2a4b89fdb..5879f7488 100644 --- a/bookwyrm/templates/settings/users/server_filter.html +++ b/bookwyrm/templates/settings/users/server_filter.html @@ -3,5 +3,7 @@ {% block filter %} - +
+ +
{% endblock %} diff --git a/bookwyrm/templates/settings/users/username_filter.html b/bookwyrm/templates/settings/users/username_filter.html index d7da033a9..343e61c8f 100644 --- a/bookwyrm/templates/settings/users/username_filter.html +++ b/bookwyrm/templates/settings/users/username_filter.html @@ -3,6 +3,7 @@ {% block filter %} - +
+ +
{% endblock %} - diff --git a/bookwyrm/templates/snippets/status/layout.html b/bookwyrm/templates/snippets/status/layout.html index 174c379f1..5cbcef208 100644 --- a/bookwyrm/templates/snippets/status/layout.html +++ b/bookwyrm/templates/snippets/status/layout.html @@ -1,7 +1,6 @@ {% extends 'components/card.html' %} {% load i18n %} {% load utilities %} -{% load cache %} {% block card-header %} {% endif %} - {% endcache %} {% else %} diff --git a/bookwyrm/templates/snippets/status/status_options.html b/bookwyrm/templates/snippets/status/status_options.html index 854d4779e..fdf8ac148 100644 --- a/bookwyrm/templates/snippets/status/status_options.html +++ b/bookwyrm/templates/snippets/status/status_options.html @@ -20,17 +20,21 @@ {% if status.status_type != 'GeneratedNote' and status.status_type != 'Rating' %} {% endif %} {% else %} {# things you can do to other people's statuses #}