diff --git a/src/badger/models.py b/src/badger/models.py index fa9b47d..cca9bc4 100644 --- a/src/badger/models.py +++ b/src/badger/models.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +from django.conf import settings from django.contrib.auth import get_user_model from django.db import models from django.utils.translation import ugettext as _ @@ -55,6 +56,9 @@ class Badge(models.Model): verbose_name = _(u'Badge') verbose_name_plural = _(u'Badges') + def get_badge_url(self): + return u'{}{}'.format(settings.MEDIA_URL, self.image) + def __unicode__(self): return u'{} ({}, {})'.format( self.title, diff --git a/src/colab/custom_settings.py b/src/colab/custom_settings.py index b36b1d5..2080b48 100644 --- a/src/colab/custom_settings.py +++ b/src/colab/custom_settings.py @@ -231,6 +231,7 @@ STATICFILES_DIRS = ( ) STATIC_ROOT = os.path.join(BASE_DIR, '..', 'www', 'static') +MEDIA_ROOT = os.path.join(BASE_DIR, '..', 'www', 'static', 'media') TEMPLATE_DIRS = ( os.path.join(BASE_DIR, 'templates'), diff --git a/src/colab/settings.py b/src/colab/settings.py index a5e22a2..56e24e8 100644 --- a/src/colab/settings.py +++ b/src/colab/settings.py @@ -80,5 +80,6 @@ USE_TZ = True # https://docs.djangoproject.com/en/dev/howto/static-files/ STATIC_URL = '/static/' +MEDIA_URL = '/media/' from custom_settings import * diff --git a/src/colab/urls.py b/src/colab/urls.py index be295a0..dc69c9d 100644 --- a/src/colab/urls.py +++ b/src/colab/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import patterns, include, url +from django.conf.urls import patterns, include, url, static from django.conf import settings from django.views.generic import TemplateView from django.contrib import admin @@ -31,3 +31,9 @@ urlpatterns = patterns('', url(r'^', include('proxy.urls')), ) + +if settings.DEBUG: + urlpatterns += static.static( + settings.MEDIA_URL, + document_root=settings.MEDIA_ROOT + ) -- libgit2 0.21.2