From 4d2891b3616ca0eb95d7a371d8349ef54bc20f9c Mon Sep 17 00:00:00 2001
From: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
Date: Mon, 6 Apr 2015 01:36:22 -0400
Subject: [PATCH] Remove use of the permalink decorator

---
 mayan/apps/checkouts/models.py         | 4 ++--
 mayan/apps/document_indexing/models.py | 7 +++----
 mayan/apps/documents/models.py         | 9 ++++-----
 mayan/apps/folders/models.py           | 4 ++--
 mayan/apps/permissions/models.py       | 4 ++--
 5 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/mayan/apps/checkouts/models.py b/mayan/apps/checkouts/models.py
index 6782485293..fffbd2f10b 100644
--- a/mayan/apps/checkouts/models.py
+++ b/mayan/apps/checkouts/models.py
@@ -4,6 +4,7 @@ import logging
 
 from django.contrib.contenttypes import generic
 from django.contrib.contenttypes.models import ContentType
+from django.core.urlresolvers import reverse
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
@@ -52,9 +53,8 @@ class DocumentCheckout(models.Model):
             event_document_check_out.commit(actor=self.user_object, target=self.document)
         return result
 
-    @models.permalink
     def get_absolute_url(self):
-        return ('checkout:checkout_info', [self.document.pk])
+        reverse('checkout:checkout_info', args=[self.document.pk])
 
     class Meta:
         verbose_name = _('Document checkout')
diff --git a/mayan/apps/document_indexing/models.py b/mayan/apps/document_indexing/models.py
index d4598fc040..4ef5f212c8 100644
--- a/mayan/apps/document_indexing/models.py
+++ b/mayan/apps/document_indexing/models.py
@@ -1,5 +1,6 @@
 from __future__ import unicode_literals
 
+from django.core.urlresolvers import reverse
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext, ugettext_lazy as _
@@ -33,9 +34,8 @@ class Index(models.Model):
     def __str__(self):
         return self.title
 
-    @models.permalink
     def get_absolute_url(self):
-        return ('indexing:index_instance_node_view', [self.instance_root.pk])
+        reverse('indexing:index_instance_node_view', args=[self.instance_root.pk])
 
     def get_document_types_not_in_index(self):
         return DocumentType.objects.exclude(pk__in=self.document_types.all())
@@ -94,9 +94,8 @@ class IndexInstanceNode(MPTTModel):
     def index(self):
         return self.index_template_node.index
 
-    @models.permalink
     def get_absolute_url(self):
-        return ('indexing:index_instance_node_view', [self.pk])
+        reverse('indexing:index_instance_node_view', args=[self.pk])
 
     @property
     def children(self):
diff --git a/mayan/apps/documents/models.py b/mayan/apps/documents/models.py
index c37e7ce239..05a95507ff 100644
--- a/mayan/apps/documents/models.py
+++ b/mayan/apps/documents/models.py
@@ -8,9 +8,10 @@ import os
 import tempfile
 import uuid
 
-from django.db import models
 from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError
+from django.core.urlresolvers import reverse
+from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 
@@ -109,9 +110,8 @@ class Document(models.Model):
     def __str__(self):
         return self.label
 
-    @models.permalink
     def get_absolute_url(self):
-        return ('documents:document_preview', [self.pk])
+        reverse('documents:document_preview', args=[self.pk])
 
     def save(self, *args, **kwargs):
         user = kwargs.pop('user', None)
@@ -513,9 +513,8 @@ class DocumentPage(models.Model):
         verbose_name = _('Document page')
         verbose_name_plural = _('Document pages')
 
-    @models.permalink
     def get_absolute_url(self):
-        return ('documents:document_page_view', [self.pk])
+        reverse('documents:document_page_view', args=[self.pk])
 
     @property
     def siblings(self):
diff --git a/mayan/apps/folders/models.py b/mayan/apps/folders/models.py
index 49ed6c0046..54b3fadbc1 100644
--- a/mayan/apps/folders/models.py
+++ b/mayan/apps/folders/models.py
@@ -1,6 +1,7 @@
 from __future__ import unicode_literals
 
 from django.contrib.auth.models import User
+from django.core.urlresolvers import reverse
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
@@ -18,9 +19,8 @@ class Folder(models.Model):
     def __str__(self):
         return self.title
 
-    @models.permalink
     def get_absolute_url(self):
-        return ('folders:folder_view', [self.pk])
+        reverse('folders:folder_view', args=[self.pk])
 
     class Meta:
         unique_together = ('title', 'user')
diff --git a/mayan/apps/permissions/models.py b/mayan/apps/permissions/models.py
index eaf7fc1d72..4737ab7601 100644
--- a/mayan/apps/permissions/models.py
+++ b/mayan/apps/permissions/models.py
@@ -6,6 +6,7 @@ from django.contrib.auth.models import User
 from django.contrib.contenttypes import generic
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import PermissionDenied
+from django.core.urlresolvers import reverse
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext
@@ -224,9 +225,8 @@ class Role(models.Model):
     def __str__(self):
         return self.label
 
-    @models.permalink
     def get_absolute_url(self):
-        return ('permissions:role_list',)
+        reverse('permissions:role_list')
 
     def add_member(self, member):
         member = AnonymousUserSingleton.objects.passthru_check(member)