Merge branch 'njamaleddine-uuid-support' of https://github.com/njamaleddine/django-polymorphic-tree

Author: vdboor

polymorphic_tree/admin/parentadmin.py

@@ -1,12 +1,13 @@
-import json, django
-
-from django.core.exceptions import ValidationError
+import json
+import django
 from future.builtins import str, int
 from distutils.version import StrictVersion
 from django.conf import settings
 from django.core.urlresolvers import reverse
+from django.core.exceptions import ValidationError
 from django.db import transaction
 from django.http import HttpResponseNotFound, HttpResponse, HttpResponseBadRequest, HttpResponseRedirect
+from django.utils.six import integer_types
 from django.utils.translation import ugettext_lazy as _
 from mptt.exceptions import InvalidMove
 from polymorphic.admin import PolymorphicParentModelAdmin, PolymorphicModelChoiceForm
@@ -189,10 +190,22 @@ def api_node_moved_view(self, request):
  Update the position of a node, from a API request.
  """
  try:
- moved_id = int(request.POST['moved_id'])
- target_id = int(request.POST['target_id'])
+ try:
+ moved_id = int(request.POST['moved_id'])
+ target_id = int(request.POST['target_id'])
+ except ValueError:
+ moved_id = request.POST['moved_id']
+ target_id = request.POST['target_id']
+
  position = request.POST['position']
- previous_parent_id = int(request.POST['previous_parent_id']) or None
+
+ if request.POST.get('previous_parent_id'):
+ if isinstance(moved_id, integer_types) and isinstance(target_id, integer_types):
+ previous_parent_id = int(request.POST['previous_parent_id'])
+ else:
+ previous_parent_id = request.POST['previous_parent_id']
+ else:
+ previous_parent_id = None
 
  # Not using .non_polymorphic() so all models are downcasted to the derived model.
  # This causes the signal below to be emitted from the proper class as well.
@@ -227,7 +240,7 @@ def api_node_moved_view(self, request):
  'error': error
  }), content_type='application/json', status=409) # Conflict
 
- if getattr(moved, '{}_id'.format(moved._mptt_meta.parent_attr)) != previous_parent_id:
+ if str(getattr(moved, '{}_id'.format(moved._mptt_meta.parent_attr))) != str(previous_parent_id):
  return HttpResponse(json.dumps({
  'action': 'reload',
  'error': 'Client seems to be out-of-sync, please reload!'
@@ -294,4 +307,3 @@ def _get_opt(model):
  return model._meta.app_label, model._meta.model_name # Django 1.7 format
  except AttributeError:
  return model._meta.app_label, model._meta.module_name
-

polymorphic_tree/models.py

@@ -1,6 +1,7 @@
 """
 Model that inherits from both Polymorphic and MPTT.
 """
+import uuid
 import django
 from six import integer_types, string_types
 from future.utils import with_metaclass
@@ -53,7 +54,7 @@ def clean(self, value, model_instance):
  def _validate_parent(self, parent, model_instance):
  if not parent:
  return
- elif isinstance(parent, integer_types):
+ elif isinstance(parent, integer_types) or isinstance(parent, uuid.UUID):
  # TODO: Improve this code, it's a bit of a hack now because the base model is not known in the NodeTypePool.
  base_model = _get_base_polymorphic_model(model_instance.__class__)
  parent = base_model.objects.get(pk=parent)

polymorphic_tree/templates/admin/polymorphic_tree/jstree_list_results.html

@@ -47,7 +47,11 @@
  */
 
  var data = [{% adminlist_recursetree cl %}{% with is_leaf=node.is_leaf_node %}
+<<<<<<< HEAD
  {id: {{ node.pk }}, ct: {{ node.polymorphic_ctype_id }}, classes: 'nodetype-{{ ct.model|lower }}', can_have_children: {{ node.can_have_children|yesno:"true,false" }}, child_types: {% firstof node.get_child_types "[]" %}, label: '<div class="col-primary{% if is_leaf %} leaf{% endif %}"><div class="col first-column"><a href="{{ change_url }}"{% if cl.is_popup %} onclick="opener.dismissRelatedLookupPopup(window, {{ node.pk }}); return false;"{% endif %}>{{ first_column|escapejs }}</a></div></div>{% if other_columns %}<div class="col-metadata">{% for name, repr in other_columns %}<div class="col col-{{ name }}">{{ repr|escapejs }}</div>{% endfor %}</div>{% endif %}'{% if not is_leaf %},
+=======
+ {id: '{{ node.pk }}', classes: 'nodetype-{{ node|real_model_name|lower }}', can_have_children: {{ node.can_have_children|yesno:'true,false' }}, label: '<div class="col-primary{% if is_leaf %} leaf{% endif %}"><div class="col first-column"><a href="{{ change_url }}"{% if cl.is_popup %} onclick="opener.dismissRelatedLookupPopup(window, {{ node.pk }}); return false;"{% endif %}>{{ first_column|escapejs }}</a></div></div>{% if other_columns %}<div class="col-metadata">{% for name, repr in other_columns %}<div class="col col-{{ name }}">{{ repr|escapejs }}</div>{% endfor %}</div>{% endif %}'{% if not is_leaf %},
+>>>>>>> 48dde42912c3484f84c7abb9f11b39287233b93f
  children: [ {{ children }}
  ]{% endif %}},{% endwith %}{% endadminlist_recursetree %}
  null // for MSIE
@@ -92,9 +96,9 @@
  url: '{{ cl.model_admin.api_node_moved_view_url }}',
  dataType: 'json',
  data: {
- 'moved_id': parseInt(move_info.moved_node.id),
- 'target_id': parseInt(move_info.target_node.id),
- 'previous_parent_id': parseInt(move_info.previous_parent.id || 0),
+ 'moved_id': move_info.moved_node.id,
+ 'target_id': move_info.target_node.id,
+ 'previous_parent_id': move_info.previous_parent.id,
  'position': move_info.position,
  'csrfmiddlewaretoken': '{{ csrf_token }}'
  },