summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--newsdiff/core/models.py6
-rw-r--r--newsdiff/urls.py11
2 files changed, 12 insertions, 5 deletions
diff --git a/newsdiff/core/models.py b/newsdiff/core/models.py
index 3db2314..5101318 100644
--- a/newsdiff/core/models.py
+++ b/newsdiff/core/models.py
@@ -14,9 +14,15 @@ class HaaretzArticle(models.Model):
text = models.TextField()
date = models.DateTimeField()
+ def __unicode__(self):
+ return self.url
+
class HaaretzImage(models.Model):
article = models.ForeignKey(HaaretzArticle)
origin_url = models.CharField(max_length=200)
image = models.ImageField(upload_to='images/haaretz')
caption = models.CharField(max_length=140, blank=True, null=True)
+
+ def __unicode__(self):
+ return self.origin_url
diff --git a/newsdiff/urls.py b/newsdiff/urls.py
index f523ec9..3608768 100644
--- a/newsdiff/urls.py
+++ b/newsdiff/urls.py
@@ -1,12 +1,13 @@
+from django.conf import settings
from django.conf.urls import patterns, include, url
-
+from django.conf.urls.static import static
from django.contrib import admin
+
admin.autodiscover()
urlpatterns = patterns('',
- # Examples:
- # url(r'^$', 'newsdiff.views.home', name='home'),
- # url(r'^blog/', include('blog.urls')),
-
url(r'^admin/', include(admin.site.urls)),
)
+
+if settings.ENV == 'local':
+ urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)