summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2011-03-04 22:41:30 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2011-03-04 22:41:30 +0100
commit0283374c89964dd729bdd2f47d2e74820cfe81db (patch)
tree8b782d5a896018109823fa264b976cc7461c79a9
parent7e1e6aaa8224a76c9dc600e7369b1844fbaf7860 (diff)
downloadIshtar-0283374c89964dd729bdd2f47d2e74820cfe81db.tar.bz2
Ishtar-0283374c89964dd729bdd2f47d2e74820cfe81db.zip
Correct administrative act search (closes #245)
-rw-r--r--ishtar/furnitures/views.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/ishtar/furnitures/views.py b/ishtar/furnitures/views.py
index 77e4c6a6c..45de3e99c 100644
--- a/ishtar/furnitures/views.py
+++ b/ishtar/furnitures/views.py
@@ -37,7 +37,7 @@ from django.template.defaultfilters import slugify
from django.shortcuts import render_to_response, redirect
from django.utils.translation import ugettext, ugettext_lazy as _
from django.core.exceptions import ObjectDoesNotExist
-from django.core.urlresolvers import reverse
+from django.core.urlresolvers import reverse, NoReverseMatch
from django.db.models import Q
from django.core import serializers
@@ -202,9 +202,12 @@ def get_item(model, func_name, default_name, extra_request_keys=[]):
if data_type == "json":
rows = []
for data in datas:
- res = {'id':data[0],
- 'link':link_template % reverse('show-'+default_name,
- args=[data[0], ''])}
+ try:
+ lnk = link_template % reverse('show-'+default_name,
+ args=[data[0], ''])
+ except NoReverseMatch:
+ lnk = ''
+ res = {'id':data[0], 'link':lnk}
for idx, value in enumerate(data[1:]):
if value:
res[model.TABLE_COLS[idx].split('.')[-1]] = value