X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/ee56a2ca0d6c5d08ee42a9452de4353e8f2643ba..3c26965045e8881acd4d5de8c195e4aa61b95ed1:/templatetags/nodes.py diff --git a/templatetags/nodes.py b/templatetags/nodes.py index 744be4d..5ae507d 100644 --- a/templatetags/nodes.py +++ b/templatetags/nodes.py @@ -51,12 +51,11 @@ class NodeURLNode(template.Node): subpath = reverse(view_name, urlconf=node.view, args=args, kwargs=kwargs) except NoReverseMatch: if self.as_var is None: - raise + if settings.TEMPLATE_DEBUG: + raise + return settings.TEMPLATE_STRING_IF_INVALID else: - if subpath[0] == '/': - subpath = subpath[1:] - - url = node.get_absolute_url() + subpath + url = node.construct_url(subpath) if self.as_var: context[self.as_var] = url @@ -68,7 +67,7 @@ class NodeURLNode(template.Node): @register.tag(name='node_url') def do_node_url(parser, token): """ - {% node_url [for ] [as ] [as ] %} {% node_url with [for ] [as ] %} {% node_url [ [ ...] ] [for ] [as ] %} {% node_url [= [= ...] ] [for ] [as ]%} @@ -112,84 +111,4 @@ def do_node_url(parser, token): args.append(parser.compile_filter(value)) return NodeURLNode(view_name=view_name, args=args, kwargs=kwargs, node=node, as_var=as_var) - return NodeURLNode(node=node, as_var=as_var) - - -class NavigationNode(template.Node): - def __init__(self, node=None, as_var=None): - self.as_var = as_var - self.node = node - - def render(self, context): - if 'request' not in context: - return settings.TEMPLATE_STRING_IF_INVALID - - if self.node: - node = self.node.resolve(context) - else: - node = context.get('node', None) - - if not node: - return settings.TEMPLATE_STRING_IF_INVALID - - try: - nav_root = node.attributes['navigation_root'] - except KeyError: - if settings.TEMPLATE_DEBUG: - raise - return settings.TEMPLATE_STRING_IF_INVALID - - # Should I get its override and check for a max depth override there? - navigation = nav_root.get_navigation() - - if self.as_var: - context[self.as_var] = navigation - return '' - - return self.compile(navigation, context['request'].path, nav_root.get_absolute_url(), nav_root.get_level(), nav_root.get_level() + 3) - - def compile(self, navigation, active_path, root_url, current_depth, max_depth): - compiled = "" - for item in navigation: - if item['url'] in active_path and (item['url'] != root_url or root_url == active_path): - compiled += "
  • " - else: - compiled += "
  • " - - if item['url']: - compiled += "" % item['url'] - - compiled += item['title'] - - if item['url']: - compiled += "" - - if 'children' in item and current_depth < max_depth: - compiled += "
      %s
    " % self.compile(item['children'], active_path, root_url, current_depth + 1, max_depth) - - compiled += "
  • " - return compiled - - -@register.tag(name='navigation') -def do_navigation(parser, token): - """ - {% navigation [for ] [as ] %} - """ - bits = token.split_contents() - tag = bits[0] - bits = bits[1:] - node = None - as_var = None - - if len(bits) >= 2 and bits[-2] == 'as': - as_var = bits[-1] - bits = bits[:-2] - - if len(bits) >= 2 and bits[-2] == 'for': - node = parser.compile_filter(bits[-1]) - bits = bits[-2] - - if bits: - raise template.TemplateSyntaxError('`%s` template tag expects the syntax {%% %s [for ] [as ] %}' % (tag, tag)) - return NavigationNode(node, as_var) + return NodeURLNode(node=node, as_var=as_var) \ No newline at end of file