# HG changeset patch # User neko259 # Date 2016-09-21 13:49:58 # Node ID db1394d8cee67c0aa45cf9597a01faeec80f9f00 # Parent 4c743293b0e8e762c121bb93edf5f5cb984699a5 Load banners in all pages diff --git a/boards/context_processors.py b/boards/context_processors.py --- a/boards/context_processors.py +++ b/boards/context_processors.py @@ -1,6 +1,7 @@ from boards.abstracts.settingsmanager import get_settings_manager, \ SETTING_LAST_NOTIFICATION_ID, SETTING_IMAGE_VIEWER from boards.models.user import Notification +from boards.models import Banner __author__ = 'neko259' @@ -23,6 +24,7 @@ CONTEXT_HAS_FAV_THREADS = 'has_fav_threa CONTEXT_POW_DIFFICULTY = 'pow_difficulty' CONTEXT_NEW_POST_COUNT = 'new_post_count' CONTEXT_SEARCH_ENABLED = 'search_enabled' +CONTEXT_BANNERS = 'banners' def get_notifications(context, request): @@ -80,6 +82,7 @@ def user_and_ui_processor(request): len(settings_manager.get_fav_threads()) > 0 context[CONTEXT_SEARCH_ENABLED] = 'haystack' in neboard.settings.INSTALLED_APPS + context[CONTEXT_BANNERS] = Banner.objects.order_by('-id') get_notifications(context, request) get_new_post_count(context, request) diff --git a/boards/views/all_threads.py b/boards/views/all_threads.py --- a/boards/views/all_threads.py +++ b/boards/views/all_threads.py @@ -12,7 +12,7 @@ from boards import utils, settings from boards.abstracts.paginator import get_paginator from boards.abstracts.settingsmanager import get_settings_manager from boards.forms import ThreadForm, PlainErrorList -from boards.models import Post, Thread, Ban, Banner +from boards.models import Post, Thread, Ban from boards.views.banned import BannedView from boards.views.base import BaseBoardView, CONTEXT_FORM from boards.views.posting_mixin import PostMixin @@ -29,7 +29,6 @@ TAG_DELIMITER = ' ' PARAMETER_CURRENT_PAGE = 'current_page' PARAMETER_PAGINATOR = 'paginator' PARAMETER_THREADS = 'threads' -PARAMETER_BANNERS = 'banners' PARAMETER_ADDITIONAL = 'additional_params' PARAMETER_MAX_FILE_SIZE = 'max_file_size' PARAMETER_RSS_URL = 'rss_url' @@ -80,7 +79,6 @@ class AllThreadsView(PostMixin, FileUplo params[PARAMETER_THREADS] = threads params[CONTEXT_FORM] = form - params[PARAMETER_BANNERS] = Banner.objects.order_by('-id').all() params[PARAMETER_MAX_FILE_SIZE] = self.get_max_upload_size() params[PARAMETER_RSS_URL] = self.get_rss_url()