Merge branch 'master' of github.com:djity/djity

Author: youen

djity/locale/en/LC_MESSAGES/django.mo

@@ -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/models.py

@@ -14,6 +14,7 @@ $.widget("ui.editable",{
 			get_function:undefined,
 			//send the id of the div to the save and get function
 			send_divid:false,
+
 			toolbar:'maxi',
 	},
 	_create: function() {
@@ -59,6 +60,7 @@ $.widget("ui.editable",{
 			 */
 			if(! self.options.simple)
 			{
+
 				self.editor_button = $('<button  title="'+gettext('Rich Edit')+'">'+gettext('Rich Edit')+'</button>')
 					.button({
 						icons:{
@@ -143,12 +145,12 @@ $.widget("ui.editable",{
 				editorBox = self.editorBox;
 
 			editorBox.hide(options.effect);
+
 			self._isOpen = false;
 			if(self.is_editor){
 				self.close_editor();
 			}
 			self.close();	
-
 
 	},
 
@@ -182,6 +184,7 @@ $.widget("ui.editable",{
 
 	},
 
+
 	save : function(close){
 			var self = this,
 				options = self.options,
@@ -355,8 +358,4 @@ $.widget("ui.editable",{
 			document.execCommand ('insertLineBreak', false, null);
 	},
 
-
-
-
-
 });

djity/static/djity/js/widgets/editable.js

@@ -31,7 +31,6 @@ dj.widgets.register =
 			dj.widgets.register.close();
 		};
 
-
 		this.dialog = $('<div id="register_dialog" class="ui-helper-hidden" title="' + gettext('Create an account') +'"></div>')
 			.keyup(function(e)
 			{

djity/static/djity/js/widgets/register.js

@@ -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/utils/context.py

@@ -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,14 @@ 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')}
+                templ = loader.get_template('djity/base.html')
+                return HttpResponseNotFound(templ.render(context))
+
             if 'js_target' in context:
                 func(*args,**kwargs)
                 return context['js_target'].json()