Download as
Browse Code »

Commit 8f51e01716f794a88072b76c5304f182c4636f3d

Authored by Luan
1 parent d9f567c7
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Adding media_root and media_url and a get_badge_url method

Showing 4 changed files with 13 additions and 1 deletions   Show diff stats
src/badger/models.py
  Diff comments   View file @8f51e01
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 2
  3 +from django.conf import settings
3 from django.contrib.auth import get_user_model 4 from django.contrib.auth import get_user_model
4 from django.db import models 5 from django.db import models
5 from django.utils.translation import ugettext as _ 6 from django.utils.translation import ugettext as _
@@ -55,6 +56,9 @@ class Badge(models.Model): @@ -55,6 +56,9 @@ class Badge(models.Model):
55 verbose_name = _(u'Badge') 56 verbose_name = _(u'Badge')
56 verbose_name_plural = _(u'Badges') 57 verbose_name_plural = _(u'Badges')
57 58
  59 + def get_badge_url(self):
  60 + return u'{}{}'.format(settings.MEDIA_URL, self.image)
  61 +
58 def __unicode__(self): 62 def __unicode__(self):
59 return u'{} ({}, {})'.format( 63 return u'{} ({}, {})'.format(
60 self.title, 64 self.title,
src/colab/custom_settings.py
  Diff comments   View file @8f51e01
@@ -231,6 +231,7 @@ STATICFILES_DIRS = ( @@ -231,6 +231,7 @@ STATICFILES_DIRS = (
231 ) 231 )
232 232
233 STATIC_ROOT = os.path.join(BASE_DIR, '..', 'www', 'static') 233 STATIC_ROOT = os.path.join(BASE_DIR, '..', 'www', 'static')
  234 +MEDIA_ROOT = os.path.join(BASE_DIR, '..', 'www', 'static', 'media')
234 235
235 TEMPLATE_DIRS = ( 236 TEMPLATE_DIRS = (
236 os.path.join(BASE_DIR, 'templates'), 237 os.path.join(BASE_DIR, 'templates'),
src/colab/settings.py
  Diff comments   View file @8f51e01
@@ -80,5 +80,6 @@ USE_TZ = True @@ -80,5 +80,6 @@ USE_TZ = True
80 # https://docs.djangoproject.com/en/dev/howto/static-files/ 80 # https://docs.djangoproject.com/en/dev/howto/static-files/
81 81
82 STATIC_URL = '/static/' 82 STATIC_URL = '/static/'
  83 +MEDIA_URL = '/media/'
83 84
84 from custom_settings import * 85 from custom_settings import *
src/colab/urls.py
  Diff comments   View file @8f51e01
1 -from django.conf.urls import patterns, include, url 1 +from django.conf.urls import patterns, include, url, static
2 from django.conf import settings 2 from django.conf import settings
3 from django.views.generic import TemplateView 3 from django.views.generic import TemplateView
4 from django.contrib import admin 4 from django.contrib import admin
@@ -31,3 +31,9 @@ urlpatterns = patterns('', @@ -31,3 +31,9 @@ urlpatterns = patterns('',
31 31
32 url(r'^', include('proxy.urls')), 32 url(r'^', include('proxy.urls')),
33 ) 33 )
  34 +
  35 +if settings.DEBUG:
  36 + urlpatterns += static.static(
  37 + settings.MEDIA_URL,
  38 + document_root=settings.MEDIA_ROOT
  39 + )