From 58990fa85c415f1cf178f16b84923268f7b8d74c Mon Sep 17 00:00:00 2001
From: predatell <seryi_belyi@inbox.ru>
Date: Tue, 28 Apr 2015 12:36:04 +0000
Subject: [PATCH 1/4] model_name instead module_name

---
 object_tools/sites.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/object_tools/sites.py b/object_tools/sites.py
index fefb397..ba0b42b 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 = self.rel.to._meta.module_name
+                except AttributeError:
+                    model_name = self.rel.to._meta.model_name 
                 urlpatterns += patterns('',
                     url(r'^%s/%s/' % (model._meta.app_label,
-                        model._meta.module_name),
+                        model_name),
                         include(object_tool.urls))
                 )
 

From 4baf29055ce148c7425ae77d67e25e3f93a89da8 Mon Sep 17 00:00:00 2001
From: predatell <seryi_belyi@inbox.ru>
Date: Tue, 28 Apr 2015 12:39:36 +0000
Subject: [PATCH 2/4] fix model_name

---
 object_tools/sites.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/object_tools/sites.py b/object_tools/sites.py
index ba0b42b..d8858fa 100644
--- a/object_tools/sites.py
+++ b/object_tools/sites.py
@@ -70,9 +70,9 @@ def get_urls(self):
         for model, object_tools in self._registry.iteritems():
             for object_tool in object_tools:
                 try:
-                    model_name = self.rel.to._meta.module_name
+                    model_name = model._meta.module_name
                 except AttributeError:
-                    model_name = self.rel.to._meta.model_name 
+                    model_name = model._meta.model_name 
                 urlpatterns += patterns('',
                     url(r'^%s/%s/' % (model._meta.app_label,
                         model_name),

From 20abc3e0150e8bc8ef727cdbb6d58f8a8d33c370 Mon Sep 17 00:00:00 2001
From: predatell <seryi_belyi@inbox.ru>
Date: Tue, 28 Apr 2015 12:41:38 +0000
Subject: [PATCH 3/4] model_name instead module_name

---
 object_tools/options.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

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),
         )

From 437c62f0deb20ac848b255cf152a29edca13b93c Mon Sep 17 00:00:00 2001
From: predatell <seryi_belyi@inbox.ru>
Date: Thu, 1 Oct 2015 11:09:13 +0000
Subject: [PATCH 4/4] Update change_list.html

---
 object_tools/templates/admin/change_list.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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" %}
       </a>
        &rsaquo;
-       <a href="../">
-         {{ app_label|capfirst }}
-      </a>
+       <a href="{% url 'admin:app_list' app_label=cl.opts.app_label %}">{{ cl.opts.app_config.verbose_name }}</a>
       &rsaquo;
       {{ cl.opts.verbose_name_plural|capfirst }}
     </div>