From adb45737172166cdb7afdb432f5095781807051f Mon Sep 17 00:00:00 2001 From: Emilie Date: Fri, 21 Oct 2016 12:39:56 +0200 Subject: [PATCH] Search : add product + project in results --- app/local_settings.py | 7 +++++-- app/templates/pages/includes/page_search.html | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/local_settings.py b/app/local_settings.py index a27b60a5..8c9b3147 100644 --- a/app/local_settings.py +++ b/app/local_settings.py @@ -144,7 +144,9 @@ SEARCH_MODEL_CHOICES = ('organization-pages.CustomPage', 'organization-projects.ProjectTopicPage', 'pages.Page', 'organization-media.Playlist', - 'mezzanine_agenda.Event') + 'mezzanine_agenda.Event', + 'organization-projects.Project', + 'shop.Product') PAGES_MODELS = ('organization-pages.CustomPage', @@ -152,7 +154,8 @@ PAGES_MODELS = ('organization-pages.CustomPage', 'organization-network.DepartmentPage', 'organization-network.TeamPage', 'organization-projects.ProjectTopicPage', - ) + 'organization-projects.Project', + 'shop.Product') SEARCH_PER_PAGE = 10 MAX_PAGING_LINKS = 10 diff --git a/app/templates/pages/includes/page_search.html b/app/templates/pages/includes/page_search.html index 0a5389d3..cefc5a6e 100644 --- a/app/templates/pages/includes/page_search.html +++ b/app/templates/pages/includes/page_search.html @@ -8,6 +8,7 @@ {% block icon %}files-o{% endblock %} {% block tags %} + {% with page.get_ascendants|last as top_level_parent %} {% if top_level_parent.get_content_model.title %}
@@ -24,7 +25,7 @@ {% else %}
- {% trans "Link" %} + {% trans 'Page' %}
{% endif %} -- 2.39.5