Image widget: manage posted and initiel image displaying

1 files changed, 37 insertions, 1 deletions

diff --git a/ishtar_common/widgets.py b/ishtar_common/widgets.py
index 192de6f65..22e4901cf 100644
--- a/ishtar_common/widgets.py
+++ b/ishtar_common/widgets.py
@@ -23,9 +23,9 @@ import logging
 
 from django import forms
 from django.conf import settings
+from django.core.files import File
 from django.core.urlresolvers import reverse, NoReverseMatch
 from django.db.models import fields
-from django.db.models.fields.files import ImageFieldFile
 from django.forms import ClearableFileInput
 from django.forms.utils import flatatt
 from django.forms.widgets import CheckboxSelectMultiple as \
@@ -304,6 +304,42 @@ class ImageFileInput(ClearableFileInput):
             if full_path.startswith(settings.MEDIA_ROOT):
                 value.url = settings.MEDIA_URL + full_path[
                                                  len(settings.MEDIA_ROOT):]
+        elif value:
+            full_path = settings.MEDIA_ROOT + unicode(value)
+            try:
+                with open(full_path) as f:
+                    f = File(f)
+                    f.url = settings.MEDIA_URL + unicode(value)
+                    value = f
+            except IOError:
+                return value
+
+        return value
+
+    def get_context(self, name, value, attrs):
+        context = super(ImageFileInput, self).get_context(name, value, attrs)
+        if getattr(self, 'hidden', None):
+            context['hidden_value'] = self.hidden
+        # on post memory file is used: display the name
+        if getattr(self, 'hidden_name', None):
+            context['hidden_name_value'] = self.hidden_name
+        return context
+
+    def value_from_datadict(self, data, files, name):
+        value = super(ImageFileInput, self).value_from_datadict(
+            data, files, name)
+        hidden_name = name + "-hidden"
+        hidden_name_value = name + "-hidden-name"
+        self.hidden, self.hidden_name = None, None
+        if name in files:
+            # new file posted
+            self.hidden_name = files.get(name).name
+        elif data.get(hidden_name_value, None):
+            # file posted previously - keep the name
+            self.hidden_name = data.get(hidden_name_value)
+        elif hidden_name in data:
+            # initial file
+            self.hidden = data.get(hidden_name)
         return value