Fix the errors caused by me deleting utils.py

I'm a bad person.
This commit is contained in:
Andrew Ingram 2013-05-18 17:20:49 +02:00
parent 4c021c4979
commit 6cbf712548
4 changed files with 23 additions and 11 deletions

View file

@ -33,9 +33,14 @@ class Admin2(object):
continue
raise e
def get_index_kwargs(self):
return {
'registry': self.registry,
}
def get_urls(self):
urlpatterns = patterns('',
url(r'^$', self.index_view.as_view(), name='index'),
url(r'^$', self.index_view.as_view(**self.get_index_kwargs()), name='index'),
)
for model, modeladmin in self.registry.iteritems():
app_label = model._meta.app_label

View file

@ -75,11 +75,12 @@ class ModelAdmin2(BaseAdmin2):
search_fields = ()
save_as = False
save_on_top = False
verbose_name = None
verbose_name_plural = None
create_form_class = None
update_form_class = None
# Views
index_view = views.ModelListView
create_view = views.ModelAddFormView
@ -90,6 +91,11 @@ class ModelAdmin2(BaseAdmin2):
def __init__(self, model, **kwargs):
self.model = model
if self.verbose_name is None:
self.verbose_name = self.model._meta.verbose_name
if self.verbose_name_plural is None:
self.verbose_name_plural = self.model._meta.verbose_name_plural
def get_default_view_kwargs(self):
return {
'model': self.model,

View file

@ -2,11 +2,9 @@
{% block content %}
<h1>Index</h1>
{{ object_list }}
<table>
{% for obj in object_list %}
<tr><td>{{ obj.app_name }}</td></tr>
{% for modeladmin in registry.values %}
<tr><td>{{ modeladmin.verbose_name_plural }}</td></tr>
{% endfor %}
</table>
{% endblock content %}

View file

@ -7,7 +7,6 @@ from django.db import models
from braces.views import LoginRequiredMixin, StaffuserRequiredMixin
from .utils import get_admin2s
ADMIN2_THEME_DIRECTORY = getattr(settings, "ADMIN2_THEME_DIRECTORY", "admin2/bootstrap")
@ -29,12 +28,16 @@ class Admin2Mixin(object):
return modelform_factory(self.get_model())
class IndexView(Admin2Mixin, generic.ListView):
class IndexView(Admin2Mixin, generic.TemplateView):
default_template_name = "index.html"
registry = None
def get_queryset(self):
return get_admin2s()
def get_context_data(self, **kwargs):
data = super(IndexView, self).get_context_data(**kwargs)
data.update({
'registry': self.registry
})
return data
class ModelListView(Admin2Mixin, generic.ListView):
default_template_name = "model_list.html"