temp working commit

Author: albanm

djity/project/models.py

@@ -204,7 +204,7 @@ def update_context(self,context):
         # if no module name is declared we are in the project's context
         # for example the request might be for project.css
         # in this case permissions are asked for a current status of public
-        if context['module_name'] is None:
+        if not 'module' in context:
             context['perm'] = granted_perms(context['role'],settings.PUBLIC)
 
         # get hierarchy of parent projects

djity/project/urls.py

@@ -3,6 +3,7 @@
 
 from djity.simplepage.urls import urlpatterns as simplepage_urls
 from djity.style.urls import urlpatterns as css_urls
+from djity.search.urls import urlpatterns as search_urls
 from djity.utils import djity_modules
 
 from django.utils.importlib import import_module
@@ -16,14 +17,15 @@
         url(r'^forbidden/*$','djity.project.views.forbidden',name='forbidden'),
 )
 
-
 urlpatterns = patterns('',
     # project page redirect to the first tab
     url(r'^(?P<project_name>[-\w]+)/*$','djity.project.views.first_tab',name='first_tab'),
-    # login view as a pseudo application
+    # login and navigation views as a pseudo applications
     (r'^(?P<project_name>[-\w]+)/',include(portal_urls)),
-    # all other urls are handled by djity.modules.simple_page
+    # css as a pseudo application too
     (r'^(?P<project_name>[-\w]+)/css/',include(css_urls)),
+    # and search also
+    (r'^(?P<project_name>[-\w]+)/search/',include(search_urls)),
 )
 
 #import urls from djity applications

djity/project_skeleton/urls.py_tmpl

@@ -14,7 +14,6 @@ urlpatterns = patterns('',
 
 	(r'^localeurl/', include('localeurl.urls')),
 
-
 	(r'^%s/' % settings.DAJAXICE_MEDIA_PREFIX, include('dajaxice.urls')),
 
 	(r'^jsi18n/', 'django.views.i18n.javascript_catalog',{{ 'packages': ('djity')}}),

djity/search/__init__.py

@@ -0,0 +1,6 @@
+from django.conf.urls.defaults import *
+from djity.search.views import project_search
+
+urlpatterns = patterns('djity.search.views',
+    url(r'^$', project_search, name='project_search'),
+)

djity/search/forms.py

@@ -0,0 +1,13 @@
+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'])
+    return basic_search(request, template='djity/search/search.html', extra_context=context, context_class=DjityContext)

djity/search/urls.py

@@ -0,0 +1,10 @@
+from haystack.indexes import *
+from haystack import site
+
+from djity.simplepage.models import SimplePage
+
+class SimplePageIndex(SearchIndex):
+    text = CharField(document=True, model_attr='content')
+    project = CharField(model_attr='project')
+
+site.register(SimplePage, SimplePageIndex)

djity/search/views.py

@@ -0,0 +1,39 @@
+{% extends "djity/base.html" %}
+
+{% block body %}
+    <h2>Search</h2>
+
+    <form method="get" action=".">
+        <table>
+            {{ form.as_table }}
+            <tr>
+                <td>&nbsp;</td>
+                <td>
+                    <input type="submit" value="Search">
+                </td>
+            </tr>
+        </table>
+
+        {% if query %}
+            <h3>Results</h3>
+
+            {% for result in page.object_list %}
+                <p>
+                    <a href="{{ result.object.get_absolute_url }}">{{ result.object.title }}</a>
+                </p>
+            {% empty %}
+                <p>No results found.</p>
+            {% endfor %}
+
+            {% if page.has_previous or page.has_next %}
+                <div>
+                    {% if page.has_previous %}<a href="?q={{ query }}&amp;page={{ page.previous_page_number }}">{% endif %}&laquo; Previous{% if page.has_previous %}</a>{% endif %}
+                    |
+                    {% if page.has_next %}<a href="?q={{ query }}&amp;page={{ page.next_page_number }}">{% endif %}Next &raquo;{% if page.has_next %}</a>{% endif %}
+                </div>
+            {% endif %}
+        {% else %}
+            {# Show some example queries to run, maybe query syntax, something else? #}
+        {% endif %}
+    </form>
+{% endblock %}

djity/simplepage/search_indexes.py

@@ -11,7 +11,7 @@ class JSONContext():
     def __init__(self,context):
         self.context = context
     def __repr__(self):
-         return json.dumps(dict([(k,self.context[k]) for k in self.context._marked_as_json if k != 'json_context']),cls=DjityJSONEncoder)
+        return json.dumps(dict([(k,self.context[k]) for k in self.context._marked_as_json if (k != 'json_context' and k in self.context)]),cls=DjityJSONEncoder)
 
 class DjityContext(RequestContext):
 
@@ -28,6 +28,14 @@ def __setitem__(self,key,value):
         RequestContext.__setitem__(self,key,value)
         self._marked_as_json.add(key)
 
+    def __delitem__(self,key):
+        RequestContext.__delitem__(key)
+        del self._marked_as_json[key]
+
+    def __iter__(self):
+        for k in self._marked_as_json:
+            yield (k,self[k])
+
     def mark_as_json(self,attr_name):
         self._marked_as_json.add(attr_name)
 

djity/templates/djity/search/search.html

@@ -3,14 +3,15 @@
 import logging
 
 from django.http import HttpResponse,HttpResponseNotFound,HttpResponseForbidden,HttpResponseRedirect, Http404
+from django.shortcuts import render, render_to_response
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _ 
 from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.utils.http import urlquote
 from django.contrib import messages
 from django.core.urlresolvers import reverse
 
-from django.template import RequestContext
+from django.template import RequestContext, loader
 from djity.utils.context import DjityContext, JSTarget
 
 from djity.project.models import Project
@@ -91,10 +92,6 @@ def _new_func(*args,**kwargs):
             # actually permissions are resolved here
             project.update_context(context)
 
-            # if module was not found by projet.update_context() raise 404
-            if module_name and not 'module' in context:
-                return HttpResponseRedirect(djreverse('page_not_found',context))
-
             # if the user is not allowed to use this view, redirect or ask for
             # authentication of return error
             if not perm in context['perm']:
@@ -117,7 +114,16 @@ def _new_func(*args,**kwargs):
                     context['info_message'] = request.GET['info_message']
 
             kwargs['context'] = context
-            
+
+             # if module was not found by projet.update_context() raise 404
+            if module_name and not 'module' in context:
+                context.message(_("This page does not exist on this project !"))
+                context["module"] = {'label':_('Page not found')}
+                return render_to_response('djity/base.html',context)
+                #t = loader.get_template('djity/base.html')
+                #r = t.render(context)
+                #return HttpResponseNotFound(r)
+
             if 'js_target' in context:
                 func(*args,**kwargs)
                 return context['js_target'].json()