matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow passing request, current_path and current_view parameters to Link instances before resolving them

Browse Source
This commit is contained in:
Roberto Rosario
2012-06-08 17:11:04 -04:00
parent 1cc1f8f819
commit 3094a940e1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/navigation/api.py
View File

@@ -58,11 +58,11 @@ class Link(object):
self.children_url_regex = children_url_regex or [] self.children_url_regex = children_url_regex or []
self.children_view_regex = children_view_regex or [] self.children_view_regex = children_view_regex or []
def resolve(self, context): def resolve(self, context, request=None, current_path=None, current_view=None):
# TODO: don't calculate these if passed in an argument # TODO: don't calculate these if passed in an argument
request = Variable('request').resolve(context) request = request or Variable('request').resolve(context)
current_path = request.META['PATH_INFO'] current_path = current_path or request.META['PATH_INFO']
current_view = resolve_to_name(current_path) current_view = current_view or resolve_to_name(current_path)
# Preserve unicode data in URL query # Preserve unicode data in URL query
previous_path = smart_unicode(urllib.unquote_plus(smart_str(request.get_full_path()) or smart_str(request.META.get('HTTP_REFERER', u'/')))) previous_path = smart_unicode(urllib.unquote_plus(smart_str(request.get_full_path()) or smart_str(request.META.get('HTTP_REFERER', u'/'))))