Skip to content

Commit c639a46

Browse files
committed
feature #6 move adminlte_settings from context_processors to templatetags
1 parent ac713d8 commit c639a46

File tree

3 files changed

+37
-17
lines changed

3 files changed

+37
-17
lines changed

adminlteui/context_processors.py

Lines changed: 0 additions & 12 deletions
This file was deleted.

adminlteui/templatetags/adminlte_menu.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
import django
44
from django import template
5-
from django.conf import settings
65
from django.contrib.admin import AdminSite
76
from django.http import HttpRequest
87
from django.utils.translation import gettext_lazy as _
98
from django.contrib.contenttypes.models import ContentType
10-
from adminlteui.templatetags.adminlte_options import get_adminlte_option
9+
from adminlteui.templatetags.adminlte_options import get_adminlte_option, \
10+
get_adminlte_settings
1111
from adminlteui.models import Menu
1212

1313
try:
@@ -159,8 +159,9 @@ def get_menu(context, request, position='left'):
159159
})
160160
else:
161161
for model in app.get('models', []):
162-
model['icon'] = settings.ADMINLTE_SETTINGS\
163-
.get('icons', {}).get(app['app_label'], {}).get(model['name'].lower())
162+
model['icon'] = get_adminlte_settings() \
163+
.get('icons', {}).get(app['app_label'], {}).get(
164+
model['name'].lower())
164165
# return MenuManager(available_apps, context, request)
165166
return available_apps
166167

adminlteui/templatetags/adminlte_options.py

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import traceback
22
from django import template
33
from adminlteui.models import Options
4+
from adminlteui import version
45
from django.conf import settings
56

67
register = template.Library()
@@ -14,7 +15,7 @@ def get_adminlte_option(option_name, request=None):
1415
if config_list.filter(option_name=option_name):
1516
config_[option_name] = config_list.get(
1617
option_name=option_name).option_value
17-
if request and option_name=='avatar_field':
18+
if request and option_name == 'avatar_field':
1819
try:
1920
# request.user.head_avatar
2021
image_path = eval(config_[option_name]).name
@@ -28,3 +29,33 @@ def get_adminlte_option(option_name, request=None):
2829
config_['valid'] = config_list.get(
2930
option_name=option_name).valid
3031
return config_
32+
33+
34+
@register.simple_tag
35+
def get_adminlte_settings():
36+
if hasattr(settings, 'ADMINLTE_SETTINGS'):
37+
return settings.ADMINLTE_SETTINGS
38+
else:
39+
return {
40+
'demo': True,
41+
'search_form': True,
42+
# 'skin': 'blue',
43+
# 'copyright': '<a href="https://github.com/wuyue92tree/django-adminlte-ui/tree/'+version+'">django-adminlte-ui '+version+'</a>',
44+
# 'navigation_expanded': True,
45+
46+
# if you are use custom menu, which will not effective below!
47+
48+
# 'show_apps': ['django_admin_settings', 'auth', 'main'],
49+
# 'main_navigation_app': 'django_admin_settings',
50+
'icons': {
51+
'myapp': {
52+
'shops': 'fa-shopping-cart',
53+
'products': 'fa-dollar',
54+
}
55+
}
56+
}
57+
58+
59+
@register.simple_tag
60+
def get_adminlte_version():
61+
return version

0 commit comments

Comments
 (0)