Improve error message on invalid movements

Based on commits by @psychotechnik

Author: vdboor

CHANGES.rst

@@ -2,6 +2,7 @@ Changes in version 0.8.4 (alpha release)
 ----------------------------------------
 
 * Fix list appearance in combination with django-grapelli
+* Improve error messages on invalid movements
 
 
 Changes in version 0.8.3 (alpha release)

polymorphic_tree/admin/parentadmin.py

@@ -157,9 +157,15 @@ def api_node_moved_view(self, request):
             return HttpResponseNotFound(simplejson.dumps({'action': 'reload', 'error': str(e[0])}), content_type='application/json')
 
         if not self.can_have_children(target) and position == 'inside':
-            return HttpResponse(simplejson.dumps({'action': 'reject', 'error': 'Cannot move inside target, does not allow children!'}), content_type='application/json', status=409)  # Conflict
+            return HttpResponse(simplejson.dumps({
+                'action': 'reject',
+                'error': _(u'Cannot place \u2018{0}\u2019 below \u2018{1}\u2019; a {2} does not allow children!').format(moved, target, target._meta.verbose_name)
+            }), content_type='application/json', status=409)  # Conflict
         if moved.parent_id != previous_parent_id:
-            return HttpResponse(simplejson.dumps({'action': 'reload', 'error': 'Client seems to be out-of-sync, please reload!'}), content_type='application/json', status=409)
+            return HttpResponse(simplejson.dumps({
+                'action': 'reload',
+                'error': 'Client seems to be out-of-sync, please reload!'
+            }), content_type='application/json', status=409)
 
         # TODO: with granular user permissions, check if user is allowed to edit both pages.
 

polymorphic_tree/locale/nl/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-24 20:43+0200\n"
+"POT-Creation-Date: 2012-12-30 14:49+0100\n"
 "PO-Revision-Date: 2011-01-10 23:54+0100\n"
 "Last-Translator: Diederik van der Boor <[email protected]>\n"
 "Language-Team: Dutch <[email protected]>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 1.1\n"
 
-#: models.py:37
+#: models.py:36
 msgid "The selected node cannot have child nodes."
 msgstr "De gekozen node kan geen subpagina's bevatten."
 
@@ -37,6 +37,10 @@ msgstr "Acties"
 msgid "Add sub node"
 msgstr "Sub node toevoegen"
 
+#: admin/parentadmin.py:162
+msgid "Cannot place ‘{0}’ below ‘{1}’; a {2} does not allow children!"
+msgstr "Kan ‘{0}’ niet onder ‘{1}’ plaatsen; een {2} element staat geen onderliggende elementen toe!"
+
 #: templates/admin/polymorphic_tree/add_type_form.html:27
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
@@ -49,14 +53,6 @@ msgid ""
 "page now reloaded."
 msgstr ""
 
-#: templates/admin/polymorphic_tree/jstree_list_results.html:103
-msgid ""
-"It is not allowed to move a node to the last position.\\nThe current page "
-"will now reload."
-msgstr ""
-"Het is niet toegestaan om een node te verplaatsen naar de vorige positie."
-"\\nDe huidige pagina zal nu herladen worden."
-
 #: templates/admin/polymorphic_tree/jstree_list_results.html:107
 msgid ""
 "There was an error while moving the node, please reload the current page."

polymorphic_tree/templates/admin/polymorphic_tree/jstree_list_results.html

@@ -93,14 +93,14 @@
   });
 
   function onMoveError(xhr, status, exception) {
-    response = jQuery.parseJSON(xhr.response);
+    var response = jQuery.parseJSON(xhr.responseText);
     // TODO: it would be possible to stream new data from the server instead.
     if( response.action == 'reload' ) {
       alert('{% trans "Unable to move the node, the current display is out-of-date.\nThe current page now reloaded." %}');
       location.reload();
     }
     else if( response.action == 'reject' ) {
-      alert('{% trans "It is not allowed to move a node to the last position.\nThe current page will now reload." %}');
+      alert(response.error);
       location.reload();
     }
     else {