Compare View
Commits (4)
-
Signed-off-by: Daniel Henrique <danielhmarinho@gmail.com> Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com> Signed-off-by: Sergio Oliveira <seocam@seocam.com>
-
Signed-off-by: Daniel Henrique <danielhmarinho@gmail.com> Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com> Signed-off-by: Matheus Faria <matheus.sousa.faria@gmail.com> Signed-off-by: Sergio Oliveira <seocam@seocam.com>
-
Signed-off-by: Daniel Henrique <danielhmarinho@gmail.com> Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com>
Showing
5 changed files
Show diff stats
colab/search/forms.py
| @@ -47,7 +47,6 @@ class ColabSearchForm(SearchForm): | @@ -47,7 +47,6 @@ class ColabSearchForm(SearchForm): | ||
| 47 | for key in self.fields.keys(): | 47 | for key in self.fields.keys(): |
| 48 | value = self.cleaned_data[key] | 48 | value = self.cleaned_data[key] |
| 49 | if value and key not in self.excluded_fields: | 49 | if value and key not in self.excluded_fields: |
| 50 | - print key, '-' + value | ||
| 51 | kwargs[key] = self.cleaned_data[key] | 50 | kwargs[key] = self.cleaned_data[key] |
| 52 | 51 | ||
| 53 | sqs = sqs.filter(**kwargs) | 52 | sqs = sqs.filter(**kwargs) |
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." %} |
setup.py
| @@ -42,7 +42,7 @@ EXCLUDE_FROM_PACKAGES = [] | @@ -42,7 +42,7 @@ EXCLUDE_FROM_PACKAGES = [] | ||
| 42 | 42 | ||
| 43 | setup( | 43 | setup( |
| 44 | name='colab', | 44 | name='colab', |
| 45 | - version='1.12.2', | 45 | + version='1.12.3', |
| 46 | url='https://github.com/colab-community/colab', | 46 | url='https://github.com/colab-community/colab', |
| 47 | author='Sergio Oliveira', | 47 | author='Sergio Oliveira', |
| 48 | author_email='sergio@tracy.com.br', | 48 | author_email='sergio@tracy.com.br', |