summaryrefslogtreecommitdiffstats
path: root/askbot/deps/livesettings/values.py
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-01-07 23:40:00 -0300
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-01-07 23:40:00 -0300
commitfc02faa2e23bde7f64429bf8d644b379af5aff20 (patch)
tree171e4886e33cccf2b93af3c67d82167f38572fe8 /askbot/deps/livesettings/values.py
parent1d8b3a33a4e11798b448080291b1d359a124a42a (diff)
downloadaskbot-fc02faa2e23bde7f64429bf8d644b379af5aff20.tar.gz
askbot-fc02faa2e23bde7f64429bf8d644b379af5aff20.tar.bz2
askbot-fc02faa2e23bde7f64429bf8d644b379af5aff20.zip
replaced ASKBOT_FILE_UPLOAD_DIR setting with MEDIA_ROOT
Diffstat (limited to 'askbot/deps/livesettings/values.py')
-rw-r--r--askbot/deps/livesettings/values.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/askbot/deps/livesettings/values.py b/askbot/deps/livesettings/values.py
index 9587a16d..db366465 100644
--- a/askbot/deps/livesettings/values.py
+++ b/askbot/deps/livesettings/values.py
@@ -4,6 +4,7 @@ http://code.google.com/p/django-values/
"""
from decimal import Decimal
from django import forms
+from django.conf import settings as django_settings
from django.core.exceptions import ImproperlyConfigured
from django.utils import simplejson
from django.utils.datastructures import SortedDict
@@ -600,7 +601,10 @@ class ImageValue(StringValue):
'allowed_file_extensions',
('jpg', 'gif', 'png')
)
- self.upload_directory = kwargs.pop('upload_directory')
+ self.upload_directory = kwargs.pop(
+ 'upload_directory',
+ django_settings.MEDIA_ROOT
+ )
self.upload_url = kwargs.pop('upload_url')
self.url_resolver = kwargs.pop('url_resolver', None)
super(ImageValue, self).__init__(*args, **kwargs)