diff --git a/admin2/templates/admin2/bootstrap/index.html b/admin2/templates/admin2/bootstrap/index.html index 4be92c0..2a524a3 100644 --- a/admin2/templates/admin2/bootstrap/index.html +++ b/admin2/templates/admin2/bootstrap/index.html @@ -2,8 +2,11 @@

Index

+ {% for obj in object_list %} - {{ obj }} + {% endfor %} +
{{ obj. }}
+ \ No newline at end of file diff --git a/admin2/utils.py b/admin2/utils.py index 3090645..df803b7 100644 --- a/admin2/utils.py +++ b/admin2/utils.py @@ -9,6 +9,7 @@ class AppStore(object): for key in module.__dict__.keys(): model_candidate = getattr(module, key) if hasattr(model_candidate, 'admin2'): + print model_candidate self.add_model(model_candidate) def add_model(self, model): @@ -19,16 +20,15 @@ class AppStore(object): def get_admin2s(): """ Returns a list of all admin2 implementations for the site """ apps = [] - for app_name in [x for x in settings.INSTALLED_APPS if x != 'admin2']: - name = "{0}.admin2".format(app_name) + for app_name in [x for x in settings.INSTALLED_APPS]: try: - module = import_module(name) + module = import_module("%s.admin2" % app_name) except ImportError as e: if str(e) == "No module named admin2": continue - print name raise e + #print app_name, module app_store = AppStore(module) apps.append(dict( app_name=app_name, diff --git a/admin2/views.py b/admin2/views.py index e475550..980983d 100644 --- a/admin2/views.py +++ b/admin2/views.py @@ -4,12 +4,13 @@ from django.conf import settings from django.views.generic import ListView from braces.views import LoginRequiredMixin, StaffuserRequiredMixin + from .utils import get_admin2s ADMIN2_THEME_DIRECTORY = getattr(settings, "ADMIN2_THEME_DIRECTORY", "admin2/bootstrap") -class IndexView(LoginRequiredMixin, StaffuserRequiredMixin, ListView): +class IndexView(ListView):#(LoginRequiredMixin, StaffuserRequiredMixin, ListView): def get_template_names(self): return [join(ADMIN2_THEME_DIRECTORY, "index.html")]