diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-10-01 16:53:23 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-10-01 16:53:23 +0200 |
| commit | 3137698e03d80f982c9f1cc6f319ce6ca9a2f5d6 (patch) | |
| tree | f4802592773b86ef49f66770e0f127c8a27c46aa | |
| parent | 116c0fb85dcc35986316b16aa1835467ff7cf609 (diff) | |
| download | Ishtar-3137698e03d80f982c9f1cc6f319ce6ca9a2f5d6.tar.bz2 Ishtar-3137698e03d80f982c9f1cc6f319ce6ca9a2f5d6.zip | |
Flake8
| -rw-r--r-- | ishtar_common/context_processors.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/ishtar_common/context_processors.py b/ishtar_common/context_processors.py index c288f9899..20b7f119a 100644 --- a/ishtar_common/context_processors.py +++ b/ishtar_common/context_processors.py @@ -19,13 +19,12 @@ from django.conf import settings from django.contrib.sites.models import Site -from django.utils.translation import ugettext, ugettext_lazy as _ +from django.utils.translation import ugettext_lazy as _ from ishtar_common.utils import shortify from menus import Menu -import models from archaeological_operations.models import Operation CURRENT_ITEMS = [] @@ -40,8 +39,9 @@ if 'archaeological_finds' in settings.INSTALLED_APPS: from archaeological_finds.models import Find CURRENT_ITEMS.append((_(u"Find"), Find)) + def get_base_context(request): - dct = {'URL_PATH':settings.URL_PATH} + dct = {'URL_PATH': settings.URL_PATH} try: dct["APP_NAME"] = Site.objects.get_current().name except Site.DoesNotExist: @@ -53,15 +53,15 @@ def get_base_context(request): menu = Menu(request.user) menu.init() request.session['MENU'] = menu - """ # temporary disabled + """ # temporary disabled current_action = None if 'CURRENT_ACTION' in request.session: dct['CURRENT_ACTION'] = request.session['CURRENT_ACTION'] current_action = dct['CURRENT_ACTION'] menu = Menu(request.user, current_action=current_action) menu.init() - if menu.selected_idx != None: - dct['current_theme'] = "theme-%d" % (menu.selected_idx+1) + if menu.selected_idx is not None: + dct['current_theme'] = "theme-%d" % (menu.selected_idx + 1) request.session['MENU'] = menu dct['MENU'] = request.session['MENU'] dct['JQUERY_URL'] = settings.JQUERY_URL @@ -82,4 +82,3 @@ def get_base_context(request): if items: dct['current_menu'].append((lbl, model_name, cls, items)) return dct - |