From fbaec8c402499a18c22bcd4c705188cd211c4911 Mon Sep 17 00:00:00 2001
From: felipebormann <felipe.bormann@gmail.com>
Date: Mon, 6 Feb 2017 12:16:19 -0300
Subject: [PATCH] made link work on search view

---
 subjects/templates/subjects/resource_card.html | 8 ++++++--
 subjects/views.py                              | 5 +++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/subjects/templates/subjects/resource_card.html b/subjects/templates/subjects/resource_card.html
index ddef3bb..ae8f193 100644
--- a/subjects/templates/subjects/resource_card.html
+++ b/subjects/templates/subjects/resource_card.html
@@ -55,8 +55,12 @@
                 <p>{{resource.brief_description|safe}}</p>
            
             {% endif %}
-           
-             <a href="{% url resource.access_link resource.slug %}" class="btn btn-success btn-raised"> {% trans "Access Resource" %}</a>
+        {% 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 %}
+            
            
             
          
diff --git a/subjects/views.py b/subjects/views.py
index 14b6935..d4505a4 100644
--- a/subjects/views.py
+++ b/subjects/views.py
@@ -566,8 +566,9 @@ class SubjectSearchView(LoginRequiredMixin, LogMixin, ListView):
                 q = q | Q(tags__name__unaccent__iexact=word  )
         
         subjects = Subject.objects.filter(q).distinct()
-        self.resources = Resource.objects.filter(q).distinct()
-
+        
+        self.resources = Resource.objects.select_related('link', 'filelink', 'webpage', 'ytvideo').filter(q).distinct()
+       
         self.totals = {'resources': self.resources.count(), 'my_subjects': subjects.count()}
        
         option = self.kwargs.get('option')
--
libgit2 0.21.2