Skip to content

Commit 82b2042

Browse files
committed
Added django 1.7 support
1 parent 594f9ab commit 82b2042

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

menu/menu.py

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1+
import re
2+
13
from django.conf import settings
24

3-
import re
5+
try:
6+
from django.apps import apps
7+
except ImportError:
8+
apps = False
49

510

611
class Menu(object):
@@ -47,15 +52,20 @@ def load_menus(c):
4752
if c.loaded:
4853
return
4954

55+
# Fetch all installed app names
56+
app_names = settings.INSTALLED_APPS
57+
if apps:
58+
app_names = [app_config.name for app_config in apps.get_app_configs()]
59+
5060
# loop through our INSTALLED_APPS
51-
for app in settings.INSTALLED_APPS:
61+
for app in app_names:
5262
# skip any django apps
5363
if app.startswith("django."):
5464
continue
5565

5666
menu_module = '%s.menus' % app
5767
try:
58-
__import__(menu_module, fromlist=["menu"])
68+
__import__(menu_module, fromlist=["menu", ])
5969
except ImportError:
6070
pass
6171

0 commit comments

Comments
 (0)