From 92015dc8dff371f93d2b71989354c1feefa6c6d0 Mon Sep 17 00:00:00 2001
From: ldeluigi <44567586+ldeluigi@users.noreply.github.com>
Date: Fri, 3 Mar 2023 14:20:47 +0100
Subject: [PATCH] Clean code

---
 backend/backend/production_settings.py                          | 2 +-
 backend/backend/settings.py                                     | 2 +-
 backend/spellbook/management/commands/export_variants.py        | 2 +-
 .../spellbook/templates/admin/spellbook/combo/change_form.html  | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/backend/backend/production_settings.py b/backend/backend/production_settings.py
index 69d315c6..1fffc534 100644
--- a/backend/backend/production_settings.py
+++ b/backend/backend/production_settings.py
@@ -25,7 +25,6 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = False
 
-DEFAULT_BULK_FOLDER = '/home/app/web/staticfiles/bulk'
 
 ASYNC_GENERATION = True
 
@@ -45,6 +44,7 @@
 
 # Production settings
 STATIC_ROOT = BASE_DIR / "staticfiles"
+STATIC_BULK_FOLDER = STATIC_ROOT / 'bulk'
 CSRF_COOKIE_SECURE = True
 SESSION_COOKIE_SECURE = True
 CONN_MAX_AGE = 60 * 60
diff --git a/backend/backend/settings.py b/backend/backend/settings.py
index bb782115..6c2eeb9b 100644
--- a/backend/backend/settings.py
+++ b/backend/backend/settings.py
@@ -25,7 +25,7 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-DEFAULT_BULK_FOLDER = './temp/bulk'
+STATIC_BULK_FOLDER = Path('./temp/bulk')
 
 ASYNC_GENERATION = True
 
diff --git a/backend/spellbook/management/commands/export_variants.py b/backend/spellbook/management/commands/export_variants.py
index e91e4a3b..39ffa004 100644
--- a/backend/spellbook/management/commands/export_variants.py
+++ b/backend/spellbook/management/commands/export_variants.py
@@ -24,7 +24,7 @@ def add_arguments(self, parser):
             '--file',
             type=Path,
             dest='file',
-            default=Path(settings.DEFAULT_BULK_FOLDER) / Path('variants.json')
+            default=settings.STATIC_BULK_FOLDER / 'variants.json'
         )
         parser.add_argument(
             '--id',
diff --git a/backend/spellbook/templates/admin/spellbook/combo/change_form.html b/backend/spellbook/templates/admin/spellbook/combo/change_form.html
index 953da4d9..29c54d79 100644
--- a/backend/spellbook/templates/admin/spellbook/combo/change_form.html
+++ b/backend/spellbook/templates/admin/spellbook/combo/change_form.html
@@ -1,5 +1,4 @@
 {% extends "admin/change_form.html" %}
-{% load static %}
 
 {% block extrahead %}
     {{ block.super }}