Added javascript handling of error messages on PageAdmin.change_status

Author: yakky

cms/admin/pageadmin.py

@@ -18,6 +18,8 @@
 from cms.utils import (copy_plugins, helpers, moderator, permissions, plugins, 
     get_template_from_request, get_language_from_request, 
     placeholder as placeholder_utils, admin as admin_utils, cms_static_url)
+from cms.utils.admin import HttpJsResponse
+from cms.utils.permissions import has_plugin_permission
 from copy import deepcopy
 from distutils.version import LooseVersion
 from django import template
@@ -1063,11 +1065,9 @@ def change_status(self, request, page_id):
                 if page.published or is_valid_overwrite_url(page.get_absolute_url(),page,False):
                     page.published = not page.published
                     page.save()
-                return admin_utils.render_admin_menu_item(request, page)
+                return HttpJsResponse(admin_utils.render_admin_menu_item(request, page).content,200)
             except ValidationError,e:
-                return HttpResponseServerError(json.dumps(e.messages))
-            except Exception,e:
-                return HttpResponseServerError(json.dumps(e.messages))
+                return HttpJsResponse(e.messages,500)
         else:
             return HttpResponseForbidden(unicode(_("You do not have permission to publish this page")))
 

cms/static/cms/js/change_list.js

@@ -223,7 +223,38 @@
 			if(jtarget.hasClass("publish-checkbox")) {
 				pageId = jtarget.attr("name").split("status-")[1];
 				// if I don't put data in the post, django doesn't get it
-				reloadItem(jtarget, admin_base_url + "cms/page/" + pageId + "/change-status/", { 1:1 });
+                reloadItem(
+                        jtarget, admin_base_url + "cms/page/" + pageId + "/change-status/",
+                        { 1:1 },
+                        // on success
+                        function(encoded_response,textStatus){
+                            decoded = $.parseJSON(encoded_response)
+                            response = decoded['body'];
+                            status = decoded['status'];
+                            if(status==200) {
+                                if (/page_\d+/.test($(jtarget).attr('id'))) {
+                                    // one level higher
+                                    target = $(jtarget).find('div.cont:first');
+                                } else {
+                                    target = $(jtarget).parents('div.cont:first');
+                                }
+
+                                var parent = target.parent();
+                                if (response == "NotFound") {
+                                    return parent.remove();
+                                }
+                                target.replace(response);
+                                parent.find('div.cont:first').yft();
+
+                                return true;
+                            }
+                            else {
+                                $(jtarget).attr("checked",false)
+                                alert(response);
+                                return false;
+                            }
+                        }
+                );
 				e.stopPropagation();
 				return true;
 			}
@@ -438,21 +469,24 @@
 		}
 
 		function onSuccess(response, textStatus) {
-			if (callback) callback(response, textStatus);
-			
-			if (/page_\d+/.test($(el).attr('id'))) {
-				// one level higher
-				target = $(el).find('div.cont:first');
-			} else { 
-				target = $(el).parents('div.cont:first');
-			}
-			
-			var parent = target.parent();
-			if (response == "NotFound") {
-				return parent.remove();
-			}
-			target.replace(response);
-			parent.find('div.cont:first').yft();
+            status = true;
+			if (callback) status = callback(response, textStatus);
+
+            if(status==true) {
+                if (/page_\d+/.test($(el).attr('id'))) {
+                    // one level higher
+                    target = $(el).find('div.cont:first');
+                } else {
+                    target = $(el).parents('div.cont:first');
+                }
+
+                var parent = target.parent();
+                if (response == "NotFound") {
+                    return parent.remove();
+                }
+                target.replace(response);
+                parent.find('div.cont:first').yft();
+            }
 
 			return true;
 		}
@@ -486,11 +520,13 @@
 				} else {
 					moveSuccess($('#page_'+item_id + " div.col1:eq(0)"));
 				}
+                return true;
 			},
 
 			// on error
 			function(){
 				moveError($('#page_'+item_id + " div.col1:eq(0)"));
+                return false;
 			}
 		);
 	}

cms/utils/admin.py

@@ -3,7 +3,7 @@
 from django.http import HttpResponse
 from django.shortcuts import render_to_response
 from django.template.context import RequestContext
-
+import json
 from django.contrib.sites.models import Site
 
 from cms.models import Page
@@ -12,6 +12,19 @@
 
 NOT_FOUND_RESPONSE = "NotFound"
 
+class HttpJsResponse(HttpResponse):
+    """ Extended HttpResponse type for django-javascript communication.
+
+    It wraps text messages returned to javascript functions with a status code for message handling in JS.
+    Response content is automatically serialized to json.
+    """
+    # this is the status code used by javascript to detect error semantic. Based on HTTP error statuses
+    js_dj_status = 200
+
+    def __init__(self, content, js_dj_status):
+        content = json.dumps({'status':js_dj_status,'body':content})
+        super(HttpJsResponse,self).__init__(content,content_type="application/json")
+
 
 def get_admin_menu_item_context(request, page, filtered=False):
     """