Improve multiple admin app handling

darklow · Oct 24, 2016 · 11f95a9 · 11f95a9
1 parent ee2164d
commit 11f95a9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/suit/config.py b/suit/config.py
@@ -7,9 +7,12 @@ def get_config_instance(app_name=None):
     :rtype: DjangoSuitConfig()
     """
     try:
-        return apps.get_app_config(app_name or 'suit')
+        config = apps.get_app_config(app_name or 'suit')
+        if isinstance(config, DjangoSuitConfig):
+            return config
     except LookupError:
-        return apps.get_app_config('suit')
+        pass
+    return apps.get_app_config('suit')
 
 
 #: :type: DjangoSuitConfig()

diff --git a/suit/templatetags/suit_tags.py b/suit/templatetags/suit_tags.py
@@ -16,7 +16,7 @@ def suit_body_class(value, current_app):
     css_classes = []
     config_vars_to_add = ['toggle_changelist_top_actions', 'form_submit_on_right']
     for each in config_vars_to_add:
-        if getattr(config.get_config(None, current_app), each):
+        if getattr(config.get_config(None, current_app), each, None):
             css_classes.append('suit_%s' % each)
     return ' '.join(css_classes)