fixed 'page not found bug'

Author: albanm

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

@@ -184,21 +184,12 @@ $.widget("ui.editable",{
 
 	},
 
-<<<<<<< HEAD
-	save : function(){
-=======
+
 	save : function(close){
->>>>>>> 8c7b2cb91c1b0c2b27e438a4d3afbeb43c1379b6
 			var self = this,
 				options = self.options,
 				editorBox = self.editorBox;
 
-<<<<<<< HEAD
-
-			var args =	{
-						js_target:self,
-						html:self.element.html(),
-=======
 			if(self.is_editor){
 				var html =  self.element.elrte('val');
 			}
@@ -212,25 +203,19 @@ $.widget("ui.editable",{
 			var args =	{
 						js_target:self,
 						html:html,
->>>>>>> 8c7b2cb91c1b0c2b27e438a4d3afbeb43c1379b6
 						lang:self.lang,
 					};
 			if (self.options.send_divid)
 			{
 				args['div_id'] = parseInt(self.element.attr('id'));
 			}
 
-<<<<<<< HEAD
-			dj.remote(self.options.save_function,args)
-			self.close();	
-=======
 			self.rollback=html;
 			dj.remote(self.options.save_function,args)
 			if(close)
 			{
 				self.close();
 			}
->>>>>>> 8c7b2cb91c1b0c2b27e438a4d3afbeb43c1379b6
 	},
 
 
@@ -241,9 +226,6 @@ $.widget("ui.editable",{
 				langbar = self.langbar;
 
 			if(lang == self.lang){return}
-<<<<<<< HEAD
-			if(self.rollback!=self.element.html()){
-=======
 			/*
 			if(self.is_editor){
 				var html =  self.element.elrte('val');
@@ -255,7 +237,6 @@ $.widget("ui.editable",{
 			}
 			if(self.rollback!= html ){
 				alert(self.rollback + '|' + html)
->>>>>>> 8c7b2cb91c1b0c2b27e438a4d3afbeb43c1379b6
 				msg = $('<div id="dialog-message" title="' + gettext("Text not save") + '">'
 					  +'<p>' + gettext("Save your change in the current language or cancel edition before changing language.") + '</p>'
 					  +'<div>')
@@ -265,10 +246,7 @@ $.widget("ui.editable",{
 					});
 				return;
 			}
-<<<<<<< HEAD
-=======
 			*/
->>>>>>> 8c7b2cb91c1b0c2b27e438a4d3afbeb43c1379b6
 			langbar.find('.'+self.lang).removeClass('ui-state-highlight');
 			langbar.find('.'+lang).addClass('ui-state-highlight');
 			self.lang = lang;
@@ -299,12 +277,9 @@ $.widget("ui.editable",{
 		else
 		{
 			self.element.html(html);
-<<<<<<< HEAD
-=======
 			if(self.is_editor){
 				self.element.elrte('val',self.element.html());
 			}
->>>>>>> 8c7b2cb91c1b0c2b27e438a4d3afbeb43c1379b6
 			self.rollback=self.element.html();
 		}
 	},
@@ -313,17 +288,6 @@ $.widget("ui.editable",{
 			var self = this,
 				options = self.options,
 				editorBox = self.editorBox;
-<<<<<<< HEAD
-			self.element.hide();
-
-			self.element.elrte({lang:dj.LANGUAGES_CODE,toolbar:'maxi'});
-			self.element.elrte('val',self.element.html());
-			self.element.elrte('open');
-			self.close();
-	},
-
-	close_editor : function() {
-=======
 
 			if(self.is_editor)
 			{
@@ -341,25 +305,17 @@ $.widget("ui.editable",{
 	},
 
 	close_editor : function(save) {
->>>>>>> 8c7b2cb91c1b0c2b27e438a4d3afbeb43c1379b6
 			var self = this;
 			self.element.html(self.element.elrte('val'));
 			self.element.elrte('close');
 			self.element.show();
-<<<<<<< HEAD
-			self.save();
-=======
 			self.is_editor = false;
 			self.editor_button.removeClass('ui-state-highlight');
 
->>>>>>> 8c7b2cb91c1b0c2b27e438a4d3afbeb43c1379b6
 	},
 
 	cancel : function(){
 			var self = this;
-<<<<<<< HEAD
-			self.element.html(self.rollback);
-=======
 			if(self.is_editor)
 			{
 				self.element.elrte('close');
@@ -368,7 +324,6 @@ $.widget("ui.editable",{
 				self.is_editor = false;
 				self.editor_button.removeClass('ui-state-highlight');
 			}
->>>>>>> 8c7b2cb91c1b0c2b27e438a4d3afbeb43c1379b6
 			self.close();
 	},
 
@@ -403,8 +358,4 @@ $.widget("ui.editable",{
 			document.execCommand ('insertLineBreak', false, null);
 	},
 
-
-
-
-
 });

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

@@ -119,10 +119,8 @@ def _new_func(*args,**kwargs):
             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)
+                templ = loader.get_template('djity/base.html')
+                return HttpResponseNotFound(templ.render(context))
 
             if 'js_target' in context:
                 func(*args,**kwargs)