Download as
Browse Code »

Commit 970334e292a4f69905c4c57fa87fd7dee617ab54

Authored by Jailson Dias
2 parents 8a2587b5 3a98b969
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

Merge branch 'dev' of https://github.com/amadeusproject/amadeuslms into dev

Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
users/templates/users/search.html
  Diff comments   View file @970334e
@@ -12,8 +12,7 @@ @@ -12,8 +12,7 @@
12 12
13 {% block breadcrumbs %} 13 {% block breadcrumbs %}
14 {{ block.super }} 14 {{ block.super }}
15 - {% breadcrumb 'Search' 'users:search' %}  
16 - 15 + {% breadcrumb search 'users:search' %}
17 {% endblock %} 16 {% endblock %}
18 17
19 18
users/views.py
  Diff comments   View file @970334e
@@ -261,13 +261,14 @@ class SearchView(LoginRequiredMixin, generic.ListView): @@ -261,13 +261,14 @@ class SearchView(LoginRequiredMixin, generic.ListView):
261 forum_list = Forum.objects.filter(Q(name__icontains=search)and Q(students__name = self.request.user.name)).order_by('name') 261 forum_list = Forum.objects.filter(Q(name__icontains=search)and Q(students__name = self.request.user.name)).order_by('name')
262 qtd = len(link_list) + len(file_list) + len(poll_list) + len(exam_list) + len(forum_list) 262 qtd = len(link_list) + len(file_list) + len(poll_list) + len(exam_list) + len(forum_list)
263 263
264 - 264 + translated = _('You searched for... ')
265 context['link_list'] = link_list 265 context['link_list'] = link_list
266 context['file_list'] = file_list 266 context['file_list'] = file_list
267 context['poll_list'] = poll_list 267 context['poll_list'] = poll_list
268 context['exam_list'] = exam_list 268 context['exam_list'] = exam_list
269 context['forum_list'] = forum_list 269 context['forum_list'] = forum_list
270 context['qtd'] = qtd 270 context['qtd'] = qtd
  271 + context['search'] = translated + search
271 272
272 return context 273 return context
273 274