Skip to content

Fix for 1.8 #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Fix for 1.8 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
58990fa
model_name instead module_name
Apr 28, 2015
4baf290
fix model_name
Apr 28, 2015
20abc3e
model_name instead module_name
Apr 28, 2015
437c62f
Update change_list.html
Oct 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions object_tools/options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
)
Expand Down
6 changes: 5 additions & 1 deletion object_tools/sites.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
)

Expand Down
4 changes: 1 addition & 3 deletions object_tools/templates/admin/change_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down