Search : add product + project in results

diff --git a/app/local_settings.py b/app/local_settings.py
index a27b60a5adffb0f4eeb59e7884afa5097139a658..8c9b3147c5f8429050e49a4a4bbe8f53a3f25abe 100644 (file)
--- 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 0a5389d35b86a047049cc8704ca928078f26312a..cefc5a6e1966a6627e00f0f31dd5e4da2d8fe18c 100644 (file)
--- 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 %}
             <div class="event-line-box__tags">
@@ -24,7 +25,7 @@
         {% else %}
             <div class="event-line-box__tags">
                 <div class="tag tag--small dashed dashed--gray">
-                    {% trans "Link" %}
+                    {% trans 'Page' %}
                 </div>
             </div>
         {% endif %}