diff --git a/partdoc/media/sketches/.gitignore b/partdoc/media/sketches/.gitignore new file mode 100644 index 0000000..72e8ffc --- /dev/null +++ b/partdoc/media/sketches/.gitignore @@ -0,0 +1 @@ +* diff --git a/partdoc/partdoc/settings.py b/partdoc/partdoc/settings.py index bd524b1..f4093d2 100644 --- a/partdoc/partdoc/settings.py +++ b/partdoc/partdoc/settings.py @@ -120,6 +120,9 @@ USE_TZ = True STATIC_URL = '/static/' STATIC_ROOT = 'static/' +MEDIA_URL = '/media/' +MEDIA_ROOT = '/app/media/' + DATA_UPLOAD_MAX_NUMBER_FIELDS = 10000 LOGGING = { diff --git a/partdoc/partdoc/urls.py b/partdoc/partdoc/urls.py index e592657..783caa4 100644 --- a/partdoc/partdoc/urls.py +++ b/partdoc/partdoc/urls.py @@ -21,4 +21,4 @@ from django.conf.urls.static import static urlpatterns = [ url(r'^parts/', include('parts.urls'), name="parts"), url(r'^admin/', admin.site.urls), -] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) +] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/partdoc/parts/models.py b/partdoc/parts/models.py index 931ce3c..aa1a2b4 100644 --- a/partdoc/parts/models.py +++ b/partdoc/parts/models.py @@ -34,7 +34,7 @@ class Sketch(PartModel): image = models.FileField(upload_to="sketches/", blank=True, null=True) def __str__(self): - return "Sketch: " + self.name + " (" + str(self.brand) + ")" + return "Sketch: " + self.name + " (" + str(self.product) + ")" def get_product(self): if self.product: diff --git a/partdoc/parts/templates/parts/parts.html b/partdoc/parts/templates/parts/parts.html index 47831d8..da20131 100644 --- a/partdoc/parts/templates/parts/parts.html +++ b/partdoc/parts/templates/parts/parts.html @@ -22,10 +22,10 @@ {% endfor %}