diff --git a/object_tools/options.py b/object_tools/options.py index 29c65f2..726aceb 100644 --- a/object_tools/options.py +++ b/object_tools/options.py @@ -82,16 +82,22 @@ def media(self, form): return media def reverse(self): - info = self.model._meta.app_label, self.model._meta.module_name, \ - self.name + try: + model_name = self.model._meta.module_name + except AttributeError: + model_name = self.model._meta.model_name + info = self.model._meta.app_label, model_name, self.name return reverse('object-tools:%s_%s_%s' % info) def _urls(self): """ URL patterns for tool linked to _view method. """ - info = self.model._meta.app_label, self.model._meta.module_name, \ - self.name + try: + model_name = self.model._meta.module_name + except AttributeError: + model_name = self.model._meta.model_name + info = self.model._meta.app_label, model_name, self.name urlpatterns = patterns( '', url(r'^%s/$' % self.name, self._view, name='%s_%s_%s' % info), ) diff --git a/object_tools/sites.py b/object_tools/sites.py index fefb397..d8858fa 100644 --- a/object_tools/sites.py +++ b/object_tools/sites.py @@ -69,9 +69,13 @@ def get_urls(self): # Add in each object_tool's views. for model, object_tools in self._registry.iteritems(): for object_tool in object_tools: + try: + model_name = model._meta.module_name + except AttributeError: + model_name = model._meta.model_name urlpatterns += patterns('', url(r'^%s/%s/' % (model._meta.app_label, - model._meta.module_name), + model_name), include(object_tool.urls)) ) diff --git a/object_tools/templates/admin/change_list.html b/object_tools/templates/admin/change_list.html index 6bef586..697eeb7 100644 --- a/object_tools/templates/admin/change_list.html +++ b/object_tools/templates/admin/change_list.html @@ -42,9 +42,7 @@ {% trans "Home" %} › - - {{ app_label|capfirst }} - + {{ cl.opts.app_config.verbose_name }} › {{ cl.opts.verbose_name_plural|capfirst }}