media files in demo

Author: David Burke

Dockerfile

@@ -1,14 +1,10 @@
 FROM python:3.5
+ENV PYTHONUNBUFFERED 1
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 
 COPY setup.py /usr/src/app/
 RUN pip install -e .
 
-COPY . /usr/src/app
-
-# include RUN for tests as well as CMD so that all test dependencies are
-# installed on the image and wont have to be downloaded again every time
-# the image is RUN
-CMD python setup.py test
+COPY . /usr/src/app

simple_import/views.py

@@ -302,7 +302,7 @@ def set_field_from_cell(import_log, new_object, header_row_field_name, cell):
             new_object.simple_import_m2ms[header_row_field_name] = cell
         elif isinstance(field, ForeignKey):
             related_field_name = RelationalMatch.objects.get(import_log=import_log, field_name=field.name).related_field_name
-            related_model = field.related.parent_model
+            related_model = field.remote_field.parent_model
             related_object = related_model.objects.get(**{related_field_name:cell})
             setattr(new_object, header_row_field_name, related_object)
         elif field.choices and getattr(settings, 'SIMPLE_IMPORT_LAZY_CHOICES', True):

simple_import_demo/settings.py

@@ -96,3 +96,4 @@
 # https://docs.djangoproject.com/en/1.7/howto/static-files/
 
 STATIC_URL = '/static/'
+MEDIA_URL = '/media/'

simple_import_demo/urls.py

@@ -1,7 +1,9 @@
 from django.conf.urls import include, url
 from django.contrib import admin
+from django.conf import settings
+from django.conf.urls.static import static
 
 urlpatterns = [
     url(r'^admin/', include(admin.site.urls)),
-    url(r'^simple_import/', include('simple_import.urls'))
-]
+    url(r'^simple_import/', include('simple_import.urls')),
+] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)