From b5ef5c98fb2c14efb093315b32ecb80149d9e176 Mon Sep 17 00:00:00 2001
From: Stephen McDonald <steve@jupo.org>
Date: Wed, 24 Aug 2016 18:34:36 +1000
Subject: [PATCH] Use configured storage for file uploads. Closes #145.

---
 forms_builder/example_project/settings.py | 2 ++
 forms_builder/forms/forms.py              | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/forms_builder/example_project/settings.py b/forms_builder/example_project/settings.py
index fb45c484..e3c54fe4 100644
--- a/forms_builder/example_project/settings.py
+++ b/forms_builder/example_project/settings.py
@@ -17,6 +17,8 @@
 SECRET_KEY = "asdfa4wtW#$Gse4aGdfs"
 ADMINS = ()
 
+FORMS_BUILDER_UPLOAD_ROOT = os.path.join(PROJECT_ROOT, "secret")
+
 
 MANAGERS = ADMINS
 if "test" not in sys.argv:
diff --git a/forms_builder/forms/forms.py b/forms_builder/forms/forms.py
index 38892096..3823cecb 100644
--- a/forms_builder/forms/forms.py
+++ b/forms_builder/forms/forms.py
@@ -8,7 +8,7 @@
 import django
 from django import forms
 from django.forms.extras import SelectDateWidget
-from django.core.files.storage import FileSystemStorage
+from django.core.files.storage import default_storage
 from django.core.urlresolvers import reverse
 from django.template import Template
 from django.utils.safestring import mark_safe
@@ -20,7 +20,10 @@
 from forms_builder.forms.utils import now, split_choices
 
 
-fs = FileSystemStorage(location=settings.UPLOAD_ROOT)
+fs = default_storage
+if settings.UPLOAD_ROOT is not None:
+    fs = default_storage.__class__(location=settings.UPLOAD_ROOT)
+
 
 ##############################
 # Each type of export filter #