Download as
Browse Code »

Commit fbaec8c402499a18c22bcd4c705188cd211c4911

Authored by felipebormann
1 parent f737dc1d
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

made link work on search view

Showing 2 changed files with 9 additions and 4 deletions   Show diff stats
subjects/templates/subjects/resource_card.html
  Diff comments   View file @fbaec8c
@@ -55,8 +55,12 @@ @@ -55,8 +55,12 @@
55 <p>{{resource.brief_description|safe}}</p> 55 <p>{{resource.brief_description|safe}}</p>
56 56
57 {% endif %} 57 {% endif %}
58 -  
59 - <a href="{% url resource.access_link resource.slug %}" class="btn btn-success btn-raised"> {% trans "Access Resource" %}</a> 58 + {% if resource.link %}
  59 + <a href="{{resource.link.link_url}}" class="btn btn-success btn-raised" target="_blank"> {% trans "Access Resource" %}</a>
  60 + {% else %}
  61 + <a href="{% url resource.access_link resource.slug %}" class="btn btn-success btn-raised"> {% trans "Access Resource" %}</a>
  62 + {% endif %}
  63 +
60 64
61 65
62 66
subjects/views.py
  Diff comments   View file @fbaec8c
@@ -566,8 +566,9 @@ class SubjectSearchView(LoginRequiredMixin, LogMixin, ListView): @@ -566,8 +566,9 @@ class SubjectSearchView(LoginRequiredMixin, LogMixin, ListView):
566 q = q | Q(tags__name__unaccent__iexact=word ) 566 q = q | Q(tags__name__unaccent__iexact=word )
567 567
568 subjects = Subject.objects.filter(q).distinct() 568 subjects = Subject.objects.filter(q).distinct()
569 - self.resources = Resource.objects.filter(q).distinct()  
570 - 569 +
  570 + self.resources = Resource.objects.select_related('link', 'filelink', 'webpage', 'ytvideo').filter(q).distinct()
  571 +
571 self.totals = {'resources': self.resources.count(), 'my_subjects': subjects.count()} 572 self.totals = {'resources': self.resources.count(), 'my_subjects': subjects.count()}
572 573
573 option = self.kwargs.get('option') 574 option = self.kwargs.get('option')