From af667d8632b6cd58940b6f5a55981c80cb4d9ccb Mon Sep 17 00:00:00 2001
From: Zambom <erikzambom@hotmail.com>
Date: Sun, 12 Feb 2017 02:21:33 -0200
Subject: [PATCH] Changing resources access_link to pass entire reversed link

---
 file_link/models.py                            |  3 ++-
 links/models.py                                |  2 +-
 pdf_file/models.py                             |  3 ++-
 subjects/templates/subjects/resource_card.html | 10 ++--------
 topics/templates/resources/list.html           |  2 +-
 webpage/models.py                              |  5 +++--
 youtube_video/models.py                        |  5 +++--
 7 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/file_link/models.py b/file_link/models.py
index adbd5d6..018e36d 100644
--- a/file_link/models.py
+++ b/file_link/models.py
@@ -2,6 +2,7 @@ import os
 from django.db import models
 from django.core.exceptions import ValidationError
 from django.utils.translation import ugettext_lazy as _
+from django.core.urlresolvers import reverse_lazy
 
 from topics.models import Resource
 
@@ -36,7 +37,7 @@ class FileLink(Resource):
 		return self.name
 
 	def access_link(self):
-		return 'file_links:download'
+		return reverse_lazy('file_links:download', args = (), kwargs = {'slug': self.slug})
 
 	def update_link(self):
 		return 'file_links:update'
diff --git a/links/models.py b/links/models.py
index e44b02b..d4899fb 100644
--- a/links/models.py
+++ b/links/models.py
@@ -19,7 +19,7 @@ class Link(Resource):
         return self.name
 
     def access_link(self):
-        return 'links:view'
+        return self.link_url
 
     def update_link(self):
         return 'links:update'
diff --git a/pdf_file/models.py b/pdf_file/models.py
index 158550a..38d502f 100644
--- a/pdf_file/models.py
+++ b/pdf_file/models.py
@@ -2,6 +2,7 @@ from django.db import models
 from django.utils.translation import ugettext_lazy as _
 import os
 from django.core.exceptions import ValidationError
+from django.core.urlresolvers import reverse_lazy
 
 from topics.models import Resource
 # Create your models here.
@@ -29,7 +30,7 @@ class PDFFile(Resource):
         return self.name
 
     def access_link(self):
-        return 'pdf_files:view'
+        return reverse_lazy('pdf_files:view', args = (), kwargs = {'slug': self.slug})
 
     def update_link(self):
         return 'pdf_files:update'
diff --git a/subjects/templates/subjects/resource_card.html b/subjects/templates/subjects/resource_card.html
index 9e091c4..8c563bf 100644
--- a/subjects/templates/subjects/resource_card.html
+++ b/subjects/templates/subjects/resource_card.html
@@ -57,14 +57,8 @@
                 <p>{{resource.brief_description|safe}}</p>
            
             {% endif %}
-        {% if resource.link %}
-             <a href="{{resource.link.link_url}}" class="btn btn-success btn-raised" target="_blank"> {% trans "Access Resource" %}</a>
-        {% else %}
-            <a href="{% url resource.access_link resource.slug %}" class="btn btn-success btn-raised"> {% trans "Access Resource" %}</a>
-        {% endif %}
-            
-           
-            
+
+            <a href="{{ resource.access_link }}" {% if resource.show_window %}target="_blank"{% endif %} class="btn btn-success btn-raised"> {% trans "Access Resource" %}</a>
          
         </div>
 
diff --git a/topics/templates/resources/list.html b/topics/templates/resources/list.html
index b8adb21..2db64ad 100644
--- a/topics/templates/resources/list.html
+++ b/topics/templates/resources/list.html
@@ -14,7 +14,7 @@
 		    	<input type="hidden" class="url_order" value="{% url 'topics:update_resource_order' %}" />
 
 	  			<h4 class="pull-left list-group-item-heading">
-	  				<a data-href="{% url resource.access_link resource.slug %}" class="resource_link" {% if resource.show_window %}target="_blank"{% endif %}>
+	  				<a data-href="{{ resource.access_link }}" class="resource_link" {% if resource.show_window %}target="_blank"{% endif %}>
 
 						{{ resource.name }}
 	  				</a>
diff --git a/webpage/models.py b/webpage/models.py
index fd9f8ad..ddd2a4c 100644
--- a/webpage/models.py
+++ b/webpage/models.py
@@ -1,5 +1,6 @@
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
+from django.core.urlresolvers import reverse_lazy
 
 from topics.models import Resource
 
@@ -15,9 +16,9 @@ class Webpage(Resource):
 
 	def access_link(self):
 		if self.show_window:
-			return 'webpages:window_view'
+			return reverse_lazy('webpages:window_view', args = (), kwargs = {'slug': self.slug})
 
-		return 'webpages:view'
+		return reverse_lazy('webpages:view', args = (), kwargs = {'slug': self.slug})
 
 	def update_link(self):
 		return 'webpages:update'
diff --git a/youtube_video/models.py b/youtube_video/models.py
index a2bc60c..cb15a90 100644
--- a/youtube_video/models.py
+++ b/youtube_video/models.py
@@ -1,5 +1,6 @@
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
+from django.core.urlresolvers import reverse_lazy
 
 from topics.models import Resource
 
@@ -15,9 +16,9 @@ class YTVideo(Resource):
 
 	def access_link(self):
 		if self.show_window:
-			return 'youtube:window_view'
+			return reverse_lazy('youtube:window_view', args = (), kwargs = {'slug': self.slug})
 
-		return 'youtube:view'
+		return reverse_lazy('youtube:view', args = (), kwargs = {'slug': self.slug})
 
 	def update_link(self):
 		return 'youtube:update'
--
libgit2 0.21.2