Remove remaining resolve_to_name code

mayan/apps/documents/views.py

@@ -6,7 +6,7 @@ import urlparse
 from django.conf import settings
 from django.contrib import messages
 from django.core.exceptions import PermissionDenied
-from django.core.urlresolvers import reverse
+from django.core.urlresolvers import resolve, reverse
 from django.http import HttpResponseRedirect
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
@@ -23,7 +23,6 @@ from common.widgets import two_state_template
 from converter.literals import (DEFAULT_FILE_FORMAT_MIMETYPE, DEFAULT_PAGE_NUMBER,
                                 DEFAULT_ROTATION, DEFAULT_ZOOM_LEVEL)
 from filetransfers.api import serve_file
-from navigation.utils import resolve_to_name
 from permissions.models import Permission
 
 from .events import (
@@ -655,7 +654,7 @@ def document_page_navigation_next(request, document_page_id):
     except PermissionDenied:
         AccessEntry.objects.check_access(PERMISSION_DOCUMENT_VIEW, request.user, document_page.document)
 
-    view = resolve_to_name(urlparse.urlparse(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))).path)
+    view = resolve(urlparse.urlparse(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))).path).view_name
 
     if document_page.page_number >= document_page.siblings.count():
         messages.warning(request, _('There are no more pages in this document'))
@@ -673,7 +672,7 @@ def document_page_navigation_previous(request, document_page_id):
     except PermissionDenied:
         AccessEntry.objects.check_access(PERMISSION_DOCUMENT_VIEW, request.user, document_page.document)
 
-    view = resolve_to_name(urlparse.urlparse(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))).path)
+    view = resolve(urlparse.urlparse(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))).path).view_name
 
     if document_page.page_number <= 1:
         messages.warning(request, _('You are already at the first page of this document'))
@@ -692,7 +691,7 @@ def document_page_navigation_first(request, document_page_id):
     except PermissionDenied:
         AccessEntry.objects.check_access(PERMISSION_DOCUMENT_VIEW, request.user, document_page.document)
 
-    view = resolve_to_name(urlparse.urlparse(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))).path)
+    view = resolve(urlparse.urlparse(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))).path).view_name
 
     return HttpResponseRedirect('{0}?{1}'.format(reverse(view, args=[document_page.pk]), request.GET.urlencode()))
 
@@ -706,7 +705,7 @@ def document_page_navigation_last(request, document_page_id):
     except PermissionDenied:
         AccessEntry.objects.check_access(PERMISSION_DOCUMENT_VIEW, request.user, document_page.document)
 
-    view = resolve_to_name(urlparse.urlparse(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))).path)
+    view = resolve(urlparse.urlparse(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))).path).view_name
 
     return HttpResponseRedirect('{0}?{1}'.format(reverse(view, args=[document_page.pk]), request.GET.urlencode()))
 
@@ -730,7 +729,7 @@ def transform_page(request, document_page_id, zoom_function=None, rotation_funct
     except PermissionDenied:
         AccessEntry.objects.check_access(PERMISSION_DOCUMENT_VIEW, request.user, document_page.document)
 
-    view = resolve_to_name(urlparse.urlparse(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))).path)
+    view = resolve(urlparse.urlparse(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))).path).view_name
 
     # Get the query string from the referer url
     query = urlparse.urlparse(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))).query

mayan/apps/navigation/templatetags/navigation_tags.py

@@ -6,7 +6,7 @@ import re
 import urllib
 import urlparse
 
-from django.core.urlresolvers import NoReverseMatch, reverse
+from django.core.urlresolvers import NoReverseMatch, resolve, reverse
 from django.template import (
     TemplateSyntaxError, Library, VariableDoesNotExist, Node, Variable
 )
@@ -17,7 +17,6 @@ from common.utils import urlquote
 
 from ..api import object_navigation, top_menu_entries
 from ..forms import MultiItemForm
-from ..utils import resolve_to_name
 
 register = Library()
 
@@ -26,7 +25,7 @@ class TopMenuNavigationNode(Node):
     def render(self, context):
         request = Variable('request').resolve(context)
         current_path = request.META['PATH_INFO']
-        current_view = resolve_to_name(current_path)
+        current_view = resolve(current_path).view_name
 
         all_menu_links = [entry.get('link', {}) for entry in top_menu_entries]
         menu_links = resolve_links(context, all_menu_links, current_view, current_path)
@@ -155,7 +154,7 @@ def get_navigation_object(context, object_name=None):
 def _get_object_navigation_links(context, menu_name=None, links_dict=object_navigation, obj=None, object_name=None):
     request = Variable('request').resolve(context)
     current_path = request.META['PATH_INFO']
-    current_view = resolve_to_name(current_path)
+    current_view = resolve(current_path).view_name
     context_links = []
 
     # Don't fudge with the original global dictionary

mayan/apps/navigation/utils.py

@@ -1,5 +0,0 @@
-from django.core.urlresolvers import resolve
-
-
-def resolve_to_name(path, urlconf=None):
-    return resolve(path, urlconf=urlconf).view_name