Task #288: add 'project' filter

diff --git a/app/local_settings.py b/app/local_settings.py
index 8c9b3147c5f8429050e49a4a4bbe8f53a3f25abe..80e6540b7427f2054d5f1b0f95f22a3c8e4c9bde 100644 (file)
--- a/app/local_settings.py
+++ b/app/local_settings.py
@@ -154,7 +154,6 @@ PAGES_MODELS = ('organization-pages.CustomPage',
                 'organization-network.DepartmentPage',
                 'organization-network.TeamPage',
                 'organization-projects.ProjectTopicPage',
-                'organization-projects.Project',
                 'shop.Product')
 
 SEARCH_PER_PAGE = 10

diff --git a/app/organization/core/views.py b/app/organization/core/views.py
index 4d18e3a96b4206900942064da15e58a706380af9..19b750da79462f1e1203418a413f17cd8d769d4b 100644 (file)
--- a/app/organization/core/views.py
+++ b/app/organization/core/views.py
@@ -13,6 +13,7 @@ from operator import ior, iand
 from organization.media.models import Playlist
 from mezzanine_agenda.models import Event
 from organization.pages.models import CustomPage
+from organization.projects.models import Project
 
 class SlugMixin(object):
 
@@ -52,6 +53,7 @@ class CustomSearchView(TemplateView):
         results_media_count = len(Playlist.objects.search(query, for_user=request.user))
         results_page_count = len(CustomPage.objects.search(query, for_user=request.user))
         results_event_count = len(Event.objects.search(query, for_user=request.user))
+        results_project_count = len(Project.objects.search(query, for_user=request.user))
 
         # count objects
         filter_dict = dict()
@@ -94,6 +96,11 @@ class CustomSearchView(TemplateView):
                 'verbose_name' : 'Media',
                 'app_label' : 'organization-media'
             },
+            'Project': {
+                'count' : results_project_count,
+                'verbose_name' : 'Project',
+                'app_label' : 'organization-projects'
+            },
         }
 
         # get url param

diff --git a/app/templates/pages/includes/page_search.html b/app/templates/pages/includes/page_search.html
index cefc5a6e1966a6627e00f0f31dd5e4da2d8fe18c..160ee9a096ef7f045467ed268a9c5968440eb8e5 100644 (file)
--- a/app/templates/pages/includes/page_search.html
+++ b/app/templates/pages/includes/page_search.html
@@ -8,7 +8,6 @@
 {% 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">
@@ -22,6 +21,12 @@
                     {{ page.departmentpage.title }}
                 </div>
             </div>
+        {% elif page|classname == "Project"  %}
+            <div class="event-line-box__tags">
+                <div class="tag tag--small dashed">
+                    {{ page|classname }}
+                </div>
+            </div>
         {% else %}
             <div class="event-line-box__tags">
                 <div class="tag tag--small dashed dashed--gray">