From 06cde627d25e94fed06939fe98ab92c9fd3a327b Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 2 Feb 2012 09:12:58 -0400 Subject: [PATCH] Simplify node link generator --- apps/document_indexing/api.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/apps/document_indexing/api.py b/apps/document_indexing/api.py index f0743cd764..b16f065d29 100644 --- a/apps/document_indexing/api.py +++ b/apps/document_indexing/api.py @@ -63,7 +63,7 @@ def delete_indexes(document): return warnings -def get_instance_link(index_instance_node=None, text=None, simple=False): +def get_instance_link(index_instance_node, text=None, simple=False): """ Return an HTML anchor to an index instance """ @@ -74,17 +74,11 @@ def get_instance_link(index_instance_node=None, text=None, simple=False): template = u'%(value)s' else: template = u'%(value)s' - if index_instance_node: - return template % { - 'url': index_instance_node.get_absolute_url(), - 'value': text if text else (index_instance_node if index_instance_node.parent else index_instance_node.index_template_node.index) - } - else: - # Root node - return template % { - 'url': '#',#reverse('index_instance_node_view', args=[index_instance_node.parent.pk]), - 'value': ugettext(u'root') - } + + return template % { + 'url': index_instance_node.get_absolute_url(), + 'value': text if text else (index_instance_node if index_instance_node.parent else index_instance_node.index_template_node.index) + } def get_breadcrumbs(index_instance, simple=False, single_link=False, include_count=False):