Commit f4672cca02ee948e8bd8177a2138d3982440184c
Exists in
master
Merge branch 'fix-message-preview'
Showing
3 changed files
with
4 additions
and
6 deletions
Show diff stats
colab/search/templates/dashboard-message-preview.html
colab/search/templates/message-preview.html
| 1 | {% load i18n tz highlight search_preview_templates %} | 1 | {% load i18n tz highlight search_preview_templates %} |
| 2 | -{% get_search_preview_templates result as template_target %} | 2 | +{% get_dashboard_search_preview_templates result as template_target %} |
| 3 | {% include template_target %} | 3 | {% include template_target %} |
colab/search/templates/search/search.html
| 1 | {% extends "base.html" %} | 1 | {% extends "base.html" %} |
| 2 | -{% load i18n highlight superarchives %} | 2 | +{% load i18n tz highlight superarchives search_preview_templates %} |
| 3 | {% load static from staticfiles %} | 3 | {% load static from staticfiles %} |
| 4 | 4 | ||
| 5 | {% block title %}{% trans 'search'|title %}{% endblock %} | 5 | {% block title %}{% trans 'search'|title %}{% endblock %} |
| @@ -70,7 +70,8 @@ We must use STATIC_URL because we have a language composing the URL | @@ -70,7 +70,8 @@ We must use STATIC_URL because we have a language composing the URL | ||
| 70 | <div class="col-md-10 col-lg-10"> | 70 | <div class="col-md-10 col-lg-10"> |
| 71 | <ul class="list-unstyled"> | 71 | <ul class="list-unstyled"> |
| 72 | {% for result in page.object_list %} | 72 | {% for result in page.object_list %} |
| 73 | - {% include "message-preview.html" %} | 73 | + {% get_search_preview_templates result as template_target %} |
| 74 | + {% include template_target %} | ||
| 74 | {% empty %} | 75 | {% empty %} |
| 75 | <li class="text-center"> | 76 | <li class="text-center"> |
| 76 | {% trans "No results for your search." %} | 77 | {% trans "No results for your search." %} |