Search: only page

diff --git a/app/local_settings.py b/app/local_settings.py
index b1fb9bf73144f2a48e564f8274d8351d3ac0367f..e9de2f15b7cf435e86c38005988dfead53ddd21a 100644 (file)
--- a/app/local_settings.py
+++ b/app/local_settings.py
@@ -129,6 +129,7 @@ DASHBOARD_TAGS = ( ("mezzanine_tags.app_list",), (), ("mezzanine_tags.recent_act
 GRAPPELLI_ADMIN_TITLE = 'IRCAM Admin'
 
 SEARCH_MODEL_CHOICES = None # all objects
+SEARCH_MODEL_CHOICES = ('pages.Page',)
 SEARCH_PER_PAGE = 10
 MAX_PAGING_LINKS = 10
 

diff --git a/app/organization/core/views.py b/app/organization/core/views.py
index 0095baca93bb9cf19a99e6e6d47de772ac77c092..4813431cec099d7c5dc7947b9115549246611613 100644 (file)
--- a/app/organization/core/views.py
+++ b/app/organization/core/views.py
@@ -53,12 +53,24 @@ class CustomSearchView(TemplateView):
         # count objects
         filter_dict = dict()
         for result in results:
-            if result.__class__.__name__ in filter_dict:
-                filter_dict[result.__class__.__name__]['count'] += 1
+            # print('---------------------------')
+            parent_class = result._meta.get_parent_list()[0]
+            print(parent_class.__class__.__name__)
+            # print(parent_class == "<class 'mezzanine.pages.models.Page'>")
+            # print('---------------------------')
+
+            if result._meta.get_parent_list() == 'mezzanine.pages.models.Page':
+                classname = 'Page'
+            else :
+                classname = result.__class__.__name__
+
+            if classname in filter_dict:
+                filter_dict[classname]['count'] += 1
             else:
-                filter_dict[result.__class__.__name__] = {'count' : 1}
-                filter_dict[result.__class__.__name__].update({'app_label' : result._meta.app_label})
+                filter_dict[classname] = {'count' : 1}
+                filter_dict[classname].update({'app_label' : result._meta.app_label})
 
+        print(filter_dict)
         # get url param
         current_query = QueryDict(mutable=True)
         current_query = request.GET.copy()