Skip to content

Commit fc9773b

Browse files
committed
update!
1 parent 6aa57e8 commit fc9773b

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

apps/banners/templatetags/banner_tag.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,12 @@ def get_banner(context, place):
3838
day.append(192)
3939
day.append(254)
4040

41-
all_banners = Banner.objects.filter(date_from__lte=now, date_to__gte=now, date_time_from__lte=nowtime, date_time_to__gte=nowtime, position__tag=place, active=True)
41+
all_banners = Banner.objects.filter(date_from__lte=now,
42+
date_to__gte=now,
43+
date_time_from__lte=nowtime,
44+
date_time_to__gte=nowtime,
45+
position__tag=place,
46+
active=True)
4247
banners = all_banners.filter(reduce(or_, [Q(date_days=dt) for dt in day]))
4348

4449
if not banners:

python_ru/settings/base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@
4040
# http://whitenoise.evans.io/en/stable/django.html#using-whitenoise-in-development
4141
# 'whitenoise.runserver_nostatic',
4242
'django.contrib.staticfiles',
43-
'apps.banners',
4443
'apps.content',
4544
'apps.events',
4645
'apps.news',
4746
'apps.meetups',
47+
'apps.banners',
4848
'ckeditor',
4949
'ckeditor_uploader',
5050
)
@@ -144,7 +144,7 @@
144144
# if not sys.argv[0].endswith('py.test'):
145145
# STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
146146

147-
MEDIA_ROOT = os.path.join('media')
147+
MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
148148
MEDIA_URL = '/media/'
149149
CKEDITOR_UPLOAD_PATH = 'uploads/'
150150

0 commit comments

Comments
 (0)