From 399ed573fb147fd49eb2e3b1e7abf89e5880e3cc Mon Sep 17 00:00:00 2001
From: Felipe Henrique de Almeida Bormann <fbormann@Felipes-MacBook-Air.local>
Date: Thu, 26 Jan 2017 17:00:33 -0300
Subject: [PATCH] search now accepts unaccent items and template problems were solved

---
 subjects/templates/subjects/list_search.html | 35 +++++++++++++++++++++++++++++------
 subjects/views.py                            |  2 +-
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/subjects/templates/subjects/list_search.html b/subjects/templates/subjects/list_search.html
index 7630f33..4f6ebaf 100644
--- a/subjects/templates/subjects/list_search.html
+++ b/subjects/templates/subjects/list_search.html
@@ -13,6 +13,28 @@
 
 {% endblock breadcrumbs %}
 
+ {% block sidebar %}
+                    <ul id="sidebar-menu">
+                        <li class="item " id="subjects-link" data-toggle="tooltip" data-placement="right" title="{% trans "Subjects" %}">
+                            <a href="{% url 'subjects:index' %}">
+                                <i class="fa fa-graduation-cap" aria-hidden="true"></i>
+                            </a>
+                        </li>
+                        <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Timeline" %}">
+                            <i class="fa fa-list" aria-hidden="true" ></i>
+                        </li>
+                        <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Messages" %}">
+                            <i class="fa fa-envelope-o" aria-hidden="true"></i>
+                        </li>
+                        <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Pendencias" %}">
+                            <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+                        </li>
+                        <li class="item" data-toggle="tooltip" data-placement="right" title="{% trans "Analytics" %}">
+                            <i class="fa fa-bar-chart" aria-hidden="true"></i>
+                        </li>
+                    </ul>
+                {% endblock %}
+
 {% block content %}
 
 	 {% if messages %}
@@ -26,7 +48,11 @@
             </script>
         {% endfor %}
     {% endif %}
-
+    {% if subjects|length > 0 %}
+         <p id="search-results-title">{% trans "Search results" %}:</p>
+    {% else %}
+         <p id="search-results-title">{% trans "Search results" %}: {% trans " any subjects or resources were found on the search for " %}  {{tags}} </p>
+    {% endif %}
     <div id="core-subjects-options-div">
         <ul class="core-subjects-options">
             {% if all %}
@@ -40,7 +66,7 @@
         </ul>
     </div>
 
-    <p id="search-results-title">{% trans "Search results" %}:</p>
+   
 
     <div class="col-md-12 cards-content">
 		
@@ -54,10 +80,7 @@
 				{% pagination request paginator page_obj %}
 			</div>
 		{% else %}
-			<div class="text-center no-subjects">
-				<i class="fa fa-graduation-cap"></i>
-				<h4>{% trans 'You still do not posses any subject in our platform' %}</h4>
-			</div>
+			
 		{% endif %}
 	</div>
 
diff --git a/subjects/views.py b/subjects/views.py
index 87bef08..d4714b7 100644
--- a/subjects/views.py
+++ b/subjects/views.py
@@ -597,7 +597,7 @@ class SubjectSearchView(LoginRequiredMixin, LogMixin, ListView):
 		self.tags = tags
 		tags = tags.split(" ")
 	   	   
-		subjects = Subject.objects.filter(tags__name__in=tags)
+		subjects = Subject.objects.filter(tags__name__unaccent__in=tags)
 		#pk = self.request.user.pk
 		#my_subjects = Subject.objects.filter(Q(students__pk=pk) | Q(professor__pk=pk) | Q(category__coordinators__pk=pk) & Q(tags__name__in=tags) ).distinct()
 		
--
libgit2 0.21.2