| 1 | Index: /home/bullshit/workspace/django_svn/django/db/models/__init__.py
|
|---|
| 2 | ===================================================================
|
|---|
| 3 | --- /home/bullshit/workspace/django_svn/django/db/models/__init__.py (revision 6702)
|
|---|
| 4 | +++ /home/bullshit/workspace/django_svn/django/db/models/__init__.py (working copy)
|
|---|
| 5 | @@ -12,6 +12,7 @@
|
|---|
| 6 | from django.db.models import signals
|
|---|
| 7 | from django.utils.functional import curry
|
|---|
| 8 | from django.utils.text import capfirst
|
|---|
| 9 | +from django.core.urlresolvers import NoReverseMatch
|
|---|
| 10 |
|
|---|
| 11 | # Admin stages.
|
|---|
| 12 | ADD, CHANGE, BOTH = 1, 2, 3
|
|---|
| 13 | @@ -29,5 +30,13 @@
|
|---|
| 14 | from django.core.urlresolvers import reverse
|
|---|
| 15 | def inner(*args, **kwargs):
|
|---|
| 16 | bits = func(*args, **kwargs)
|
|---|
| 17 | - return reverse(bits[0], None, *bits[1:3])
|
|---|
| 18 | + #return reverse(bits[0], None, *bits[1:3])
|
|---|
| 19 | + try:
|
|---|
| 20 | + return reverse(bits[0], args=bits[1], kwargs=bits[2])
|
|---|
| 21 | + except NoReverseMatch:
|
|---|
| 22 | + try:
|
|---|
| 23 | + project_name = settings.SETTINGS_MODULE.split('.')[0]
|
|---|
| 24 | + return reverse(project_name + '.' +bits[0], args=bits[1], kwargs=bits[2])
|
|---|
| 25 | + except NoReverseMatch:
|
|---|
| 26 | + return ''
|
|---|
| 27 | return inner
|
|---|