|
|
|
|
@ -42,9 +42,10 @@ def get_banners(request): |
|
|
|
|
|
|
|
|
|
group_banners = BannerGroup.cached.group_banners() |
|
|
|
|
result = [] |
|
|
|
|
set_cookie = None |
|
|
|
|
# get banners for all groups |
|
|
|
|
for group, banners in group_banners.iteritems(): |
|
|
|
|
banner = get_banner_by_params(banners, good_urls, params) |
|
|
|
|
banner = get_banner_by_params(banners, good_urls, params, request) |
|
|
|
|
if banner: |
|
|
|
|
if banner.html: |
|
|
|
|
text = banner.text |
|
|
|
|
@ -66,10 +67,14 @@ def get_banners(request): |
|
|
|
|
'alt': alt, |
|
|
|
|
'text': text |
|
|
|
|
}) |
|
|
|
|
if banner.popup: |
|
|
|
|
set_cookie = banner.cookie |
|
|
|
|
# add view log |
|
|
|
|
banner.log(request, 1) |
|
|
|
|
|
|
|
|
|
return HttpResponse(json.dumps(result, indent=4), content_type='application/json') |
|
|
|
|
response = HttpResponse(json.dumps(result, indent=4), content_type='application/json') |
|
|
|
|
if set_cookie: |
|
|
|
|
response.set_cookie(set_cookie, 1) |
|
|
|
|
return response |
|
|
|
|
|
|
|
|
|
def get_top(request): |
|
|
|
|
params = {'theme': request.GET.getlist('theme', []), |
|
|
|
|
|