django-admin2/djadmin2/constants.py

from django.conf import settings

MODEL_ADMIN_ATTRS = (
                    'list_display', 'list_display_links', 'list_filter',
                    'admin', 'has_permission', 'has_add_permission',
                    'has_edit_permission', 'has_delete_permission', 'get_actions'
                         )

ADMIN2_THEME_DIRECTORY = getattr(settings, "ADMIN2_THEME_DIRECTORY", "admin2/bootstrap")
Move mixins to their own directory so the apiviews aren't directly importing from views 2013-05-22 16:40:53 +00:00			`from django.conf import settings`

			`MODEL_ADMIN_ATTRS = (`
			`'list_display', 'list_display_links', 'list_filter',`
			`'admin', 'has_permission', 'has_add_permission',`
merge conflict resolutions 2013-05-23 11:01:27 +00:00			`'has_edit_permission', 'has_delete_permission', 'get_actions'`
Move mixins to their own directory so the apiviews aren't directly importing from views 2013-05-22 16:40:53 +00:00			`)`

			`ADMIN2_THEME_DIRECTORY = getattr(settings, "ADMIN2_THEME_DIRECTORY", "admin2/bootstrap")`