made demo app searchable; narrow results according to current project and user role;

Author: albanm

djity/application_skeleton/{package_name}/search_indexes.py_tmpl

@@ -0,0 +1,24 @@
+"""
+Haystack indexes definitions to make models from application {application_name} searchable.
+
+See Haystack documentation for information to write these indexes: http://docs.haystacksearch.org/dev/searchindex_api.html
+"""
+
+from haystack import indexes
+
+from {package_name}.models import {class_name}
+
+class {class_name}Index(indexes.RealTimeSearchIndex, indexes.Indexable):
+    text = indexes.CharField(document=True, model_attr='message')
+    
+    # The following is necessary so that djity search engine shall be able to narrow results by projects and according to users roles.
+    project = indexes.IntegerField(model_attr='project__id')
+    status = indexes.MultiValueField()
+
+    def prepare_status(self,obj):
+        return range(obj.status+1)
+
+
+    def get_model(self):
+        return {class_name}
+

djity/application_skeleton/{package_name}/templates/{package_name}/{module_name}_search_result.html_tmpl

@@ -0,0 +1,6 @@
+{{% load highlight %}}
+
+<a href="{{{{ result_url }}}}">{{{{ result.object.name }}}}</a><br>
+{{% highlight result.text with query %}}
+
+

djity/project_skeleton/settings.py_tmpl

@@ -162,6 +162,15 @@ STATUS_PERMISSIONS = {{
 # list of permissions to check when updating djity's context
 PERMISSIONS = ['view','edit','upload','manage']
 
+# List of visible statuses according to role (used to filter search results)
+LOWER_VISIBLE_STATUS = {{
+    ANONYMOUS:PUBLIC,
+    AWAITING:PUBLIC,
+    USER:PRIVATE,
+    CONTRIBUTOR:DRAFT,
+    MANAGER:DRAFT,
+}}
+
 # Status display in user interface
 STATUS_DISPLAY = [[DRAFT,'Draft'],[PRIVATE,'Private'],[PUBLIC,'Public']]
 

djity/search/templatetags/search_result.py

@@ -7,5 +7,9 @@ def search_result(context, result):
     """
     Will render a search result for haystack by using the appropriate template for each model type
     """
-    return template.loader.render_to_string("djity/%s/%s_search_result.html"  % (result.app_label,result.model_name), {'result_url':result.object.djity_url(context)}, context)
+    if result.app_label.startswith("djity_"):
+        template_path = "%s/%s_search_result.html" % (result.app_label,result.model_name)
+    else:
+        template_path = "djity/%s/%s_search_result.html" % (result.app_label,result.model_name)
+    return template.loader.render_to_string(template_path, {'result_url':result.object.djity_url(context)}, context)
 

djity/search/views.py

@@ -1,14 +1,18 @@
+from django.conf import settings
+
 from haystack.views import basic_search
-from haystack.forms import ModelSearchForm
 from haystack.query import SearchQuerySet
+
 from djity.utils.decorators import djity_view
 from djity.utils.context import DjityContext
 
 @djity_view(perm='view')
 def project_search(request,context=None):
     """
-    Override haystack basic_view for customization
-    """    
-    sqs = SearchQuerySet().filter(project=context['project'])
-    #sqs = SearchQuerySet()
+    Override haystack basic_view for customization.
+    """
+    sqs = SearchQuerySet().narrow("project:%s"% context['project'].id).narrow("status:%s" % settings.LOWER_VISIBLE_STATUS[context['role']])
+    #for hidden_status in settings.HIDDEN_STATUSES[context['role']]:
+    #    sqs = sqs.exclude(status=hidden_status)
+    print sqs
     return basic_search(request, template='djity/search/search.html', searchqueryset=sqs, extra_context=context, context_class=DjityContext)

djity/simplepage/search_indexes.py

@@ -1,10 +1,16 @@
+from django.conf import settings
+
 from haystack import indexes
 
 from djity.simplepage.models import SimplePage
 
-class SimplePageIndex(indexes.SearchIndex, indexes.Indexable):
+class SimplePageIndex(indexes.RealTimeSearchIndex, indexes.Indexable):
     text = indexes.CharField(document=True, model_attr='content')
-    project = indexes.CharField(model_attr='project')
+    project = indexes.IntegerField(model_attr='project__id')
+    status = indexes.MultiValueField()
+
+    def prepare_status(self,obj):
+        return range(obj.status+1)
 
     def get_model(self):
         return SimplePage

djity/static/djity/js/djity.js

@@ -164,10 +164,8 @@ function widgetify() {
 			}
 	);
 
-
 	$('#messages').notify();
 
-
 
 	if(dj.context.perm.manage){
 		$("#project_title").editable({simple:true,save_function:'djity.project.save_project_title'});
@@ -195,13 +193,13 @@ function toolbar() {
 	$("#toolbar").buttonset();
 	$("#toolbar a")
 		.button()
-		.addClass('dj.context.mini-button');
+		.addClass('dj-mini-button');
 };
 
 function paginator() {
 	$('#paginator a')
 		.button()
-		.addClass('dj.context.mini-button');
+		.addClass('dj-mini-button');
 
 	$('#paginator .off')
 		.button('option','disabled','true');

djity/templates/djity/base.html

@@ -124,6 +124,13 @@
                     {% endif %}
 				</div>
             </div>
+            
+            <div id="search_form">
+                <form method="get" action="{% djiurl project %}/search/">
+                    <input id="search_query" name='q' type="text"></input>
+                    <input type="submit" id="search_button" value="{% trans "Search" %}" />
+                </form>
+            </div>
 
             <nav id="portal_parameters" class="ui-helper-hidden">
             </nav>