Download as
Browse Code »

Commit af667d8632b6cd58940b6f5a55981c80cb4d9ccb

Authored by Zambom
1 parent 5cf2986a
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

Changing resources access_link to pass entire reversed link

Showing 7 changed files with 14 additions and 16 deletions   Show diff stats
file_link/models.py
  Diff comments   View file @af667d8
... ... @@ -2,6 +2,7 @@ import os
2 2 from django.db import models
3 3 from django.core.exceptions import ValidationError
4 4 from django.utils.translation import ugettext_lazy as _
  5 +from django.core.urlresolvers import reverse_lazy
5 6  
6 7 from topics.models import Resource
7 8  
... ... @@ -36,7 +37,7 @@ class FileLink(Resource):
36 37 return self.name
37 38  
38 39 def access_link(self):
39   - return 'file_links:download'
  40 + return reverse_lazy('file_links:download', args = (), kwargs = {'slug': self.slug})
40 41  
41 42 def update_link(self):
42 43 return 'file_links:update'
... ...
links/models.py
  Diff comments   View file @af667d8
... ... @@ -19,7 +19,7 @@ class Link(Resource):
19 19 return self.name
20 20  
21 21 def access_link(self):
22   - return 'links:view'
  22 + return self.link_url
23 23  
24 24 def update_link(self):
25 25 return 'links:update'
... ...
pdf_file/models.py
  Diff comments   View file @af667d8
... ... @@ -2,6 +2,7 @@ from django.db import models
2 2 from django.utils.translation import ugettext_lazy as _
3 3 import os
4 4 from django.core.exceptions import ValidationError
  5 +from django.core.urlresolvers import reverse_lazy
5 6  
6 7 from topics.models import Resource
7 8 # Create your models here.
... ... @@ -29,7 +30,7 @@ class PDFFile(Resource):
29 30 return self.name
30 31  
31 32 def access_link(self):
32   - return 'pdf_files:view'
  33 + return reverse_lazy('pdf_files:view', args = (), kwargs = {'slug': self.slug})
33 34  
34 35 def update_link(self):
35 36 return 'pdf_files:update'
... ...
subjects/templates/subjects/resource_card.html
  Diff comments   View file @af667d8
... ... @@ -57,14 +57,8 @@
57 57 <p>{{resource.brief_description|safe}}</p>
58 58  
59 59 {% endif %}
60   - {% if resource.link %}
61   - <a href="{{resource.link.link_url}}" class="btn btn-success btn-raised" target="_blank"> {% trans "Access Resource" %}</a>
62   - {% else %}
63   - <a href="{% url resource.access_link resource.slug %}" class="btn btn-success btn-raised"> {% trans "Access Resource" %}</a>
64   - {% endif %}
65   -
66   -
67   -
  60 +
  61 + <a href="{{ resource.access_link }}" {% if resource.show_window %}target="_blank"{% endif %} class="btn btn-success btn-raised"> {% trans "Access Resource" %}</a>
68 62  
69 63 </div>
70 64  
... ...
topics/templates/resources/list.html
  Diff comments   View file @af667d8
... ... @@ -14,7 +14,7 @@
14 14 <input type="hidden" class="url_order" value="{% url 'topics:update_resource_order' %}" />
15 15  
16 16 <h4 class="pull-left list-group-item-heading">
17   - <a data-href="{% url resource.access_link resource.slug %}" class="resource_link" {% if resource.show_window %}target="_blank"{% endif %}>
  17 + <a data-href="{{ resource.access_link }}" class="resource_link" {% if resource.show_window %}target="_blank"{% endif %}>
18 18  
19 19 {{ resource.name }}
20 20 </a>
... ...
webpage/models.py
  Diff comments   View file @af667d8
1 1 from django.db import models
2 2 from django.utils.translation import ugettext_lazy as _
  3 +from django.core.urlresolvers import reverse_lazy
3 4  
4 5 from topics.models import Resource
5 6  
... ... @@ -15,9 +16,9 @@ class Webpage(Resource):
15 16  
16 17 def access_link(self):
17 18 if self.show_window:
18   - return 'webpages:window_view'
  19 + return reverse_lazy('webpages:window_view', args = (), kwargs = {'slug': self.slug})
19 20  
20   - return 'webpages:view'
  21 + return reverse_lazy('webpages:view', args = (), kwargs = {'slug': self.slug})
21 22  
22 23 def update_link(self):
23 24 return 'webpages:update'
... ...
youtube_video/models.py
  Diff comments   View file @af667d8
1 1 from django.db import models
2 2 from django.utils.translation import ugettext_lazy as _
  3 +from django.core.urlresolvers import reverse_lazy
3 4  
4 5 from topics.models import Resource
5 6  
... ... @@ -15,9 +16,9 @@ class YTVideo(Resource):
15 16  
16 17 def access_link(self):
17 18 if self.show_window:
18   - return 'youtube:window_view'
  19 + return reverse_lazy('youtube:window_view', args = (), kwargs = {'slug': self.slug})
19 20  
20   - return 'youtube:view'
  21 + return reverse_lazy('youtube:view', args = (), kwargs = {'slug': self.slug})
21 22  
22 23 def update_link(self):
23 24 return 'youtube:update'
... ...