From 2bbc90ec4170dd3b15fba456fede68a94f4a52dc Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Mon, 1 Nov 2010 22:58:46 -0400
Subject: fixed the remaining bug in logo uploads

---
 .gitignore                         | 3 +++
 askbot/__init__.py                 | 2 +-
 askbot/deps/livesettings/forms.py  | 4 ++--
 askbot/deps/livesettings/values.py | 6 ++++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6910427f..509dae34 100755
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,8 @@ settings.py
 .idea
 *.iml
 env
+django
+django/*
 nbproject
 pip-log.txt
 tmp/*
@@ -29,5 +31,6 @@ build
 askbot/upfiles/*.jpg
 askbot/upfiles/*.jpeg
 askbot/upfiles/*.gif
+askbot/upfiles/*.png
 askbot/skins/common/media/mathjax/
 /jinja2
diff --git a/askbot/__init__.py b/askbot/__init__.py
index 4628162b..fe6623ee 100644
--- a/askbot/__init__.py
+++ b/askbot/__init__.py
@@ -22,7 +22,7 @@ def get_version():
     """returns version of the askbot app
     this version is meaningful for pypi only
     """
-    return '0.6.20'
+    return '0.6.21'
 
 #todo: maybe send_mail functions belong to models
 #or the future API
diff --git a/askbot/deps/livesettings/forms.py b/askbot/deps/livesettings/forms.py
index c749dc0e..764247f3 100644
--- a/askbot/deps/livesettings/forms.py
+++ b/askbot/deps/livesettings/forms.py
@@ -21,7 +21,7 @@ class SettingsEditor(forms.Form):
 
         for setting in flattened:
             # Add the field to the customized field list
-            kw = {
+            kw = {#todo: maybe move into the make_field call
                 'label': setting.description,
                 'help_text': setting.help_text,
                 # Provide current setting values for initializing the form
@@ -30,7 +30,7 @@ class SettingsEditor(forms.Form):
             field = setting.make_field(**kw)
 
             k = '%s__%s' % (setting.group.key, setting.key)
-            
+
             self.fields[k] = field
             if not setting.group in groups:
                 groups.append(setting.group)
diff --git a/askbot/deps/livesettings/values.py b/askbot/deps/livesettings/values.py
index bf3a47ba..5a9b2bf8 100644
--- a/askbot/deps/livesettings/values.py
+++ b/askbot/deps/livesettings/values.py
@@ -580,8 +580,10 @@ class ImageValue(StringValue):
             kwargs['widget'] = ImageInput(url_resolver = url_resolver)
             forms.FileField.__init__(self, *args, **kwargs)
 
-        def clean(self, file_data, file_name):
-            (base_name, ext) = os.path.splitext(file_name)
+        def clean(self, file_data, initial=None):
+            if not file_data and initial:
+                return initial
+            (base_name, ext) = os.path.splitext(file_data.name)
             image_extensions = ('.jpg', '.gif', '.png')
             if ext.lower() not in image_extensions:
                 error_message = _('Allowed image file types are %(types)s') \
-- 
cgit v1.2.3-1-g7c22