adapting admin to new Node class

documents/models.py

@@ -5,7 +5,7 @@ from django.db import models
 from django.utils import timezone
 from django_hstore import hstore
 
-from treebeard.mp_tree import MP_Node
+#from treebeard.mp_tree import MP_Node
 
 from time import time
 ######################################################################

gargantext_web/settings.py

@@ -61,6 +61,7 @@ INSTALLED_APPS = (
     'django_extensions',
     #'south',
     #'documents',
+    'cte_tree',
     'node',
     'ngram',
     'django_hstore',

node/admin.py

@@ -41,12 +41,13 @@ class NodeAdmin(admin.ModelAdmin):
                 if nodeType.name == 'Project':
                     nodeParent  = Node.objects.get(type = nodeTypeParent, user = request.user)
                 else:
-                    nodeParent  = Node.objects.get(id = request.POST['parent'])
+                    nodeParent  = Node.objects.create(id = request.POST['parent'])
             except:
-                nodeParent  = Node.add_root(type = nodeTypeParent, user = request.user, name=request.user.username)
+                nodeParent  = Node.objects.create(type = nodeTypeParent, user = request.user, name=request.user.username)
             obj.user        = request.user
             
-            node            = nodeParent.add_child(type = nodeType,\
+            node            = Node.objects.create(type = nodeType,\
+                                                parent  = nodeParent,\
                                                 user    = request.user,\
                                                 name    = obj.name,\
                                                 file    = obj.file,\

node/models.py

@@ -3,7 +3,8 @@ from django.utils import timezone
 from django.contrib.auth.models import User
 
 from django_hstore import hstore
-from cte_tree.models import CTENode
+from cte_tree.models import CTENode, Manager
+#from cte_tree.fields import DepthField, PathField, OrderingField
 
 from time import time
 
@@ -21,6 +22,11 @@ class NodeType(models.Model):
         return self.name
 
 class Node(CTENode):
+#    depth       = DepthField()
+#    path        = PathField()
+#    ordering    = OrderingField()
+    objects     = Manager()
+
     user        = models.ForeignKey(User)
     type        = models.ForeignKey(NodeType)
     name        = models.CharField(max_length=200)
@@ -33,7 +39,6 @@ class Node(CTENode):
     file        = models.FileField(upload_to=upload_to, blank=True)
     #resources   = models.ManyToManyField(Resource)
     
-    #objects    = hstore.HStoreManager()
     def __str__(self):
         return self.name
 

test_nodes.ipynb

 {
  "metadata": {
   "name": "",
-  "signature": "sha256:b7be93862704b5aa1586a45cad8aee84067740b29c3983dbd88650ce5eaa4525"
+  "signature": "sha256:fc0cbe76083ada3f60090dd7197cf15e530512bb0b85d661e5b2224cfe7e5f6c"
  },
  "nbformat": 3,
  "nbformat_minor": 0,
@@ -12,14 +12,14 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "from node.models import Node, NodeType, Nodec\n",
+      "from node.models import Node, NodeType\n",
       "from django.contrib.auth.models import User\n",
       "import datetime"
      ],
      "language": "python",
      "metadata": {},
      "outputs": [],
-     "prompt_number": 1
+     "prompt_number": 2
     },
     {
      "cell_type": "code",