some changes to add resource to bdd

init/init.py

 from node.models import NodeType
 
 #NodeType.objects.all().delete()
-NodeType(name="Root").save()
-NodeType(name="Project").save()
+type_root = NodeType(name="Root")
+type_root.save()
+
+type_project = NodeType(name="Project")
+type_project.save()
+
 NodeType(name="Corpus").save()
 NodeType(name="Document").save()
 
+from node.models import Project
+Project(name="Projet sur les abeilles", type=type_project).save()
+
 from node.models import DatabaseType
 for bdd in ['Europresse', 'PubMed', 'Web Of Science (WOS), ISI format']:
     DatabaseType(name=bdd).save()

init/init.sh

@@ -3,7 +3,7 @@
 psql -d gargandb -f init.sql
 
 sleep 2
-./manage.py syncdb
+../manage.py syncdb
 
 sleep 2
-./manage.py shell < init.py
+../manage.py shell < init.py

node/admin.py

 from django.contrib import admin
 from django.forms import ModelForm, ModelChoiceField
 
-from node.models import NodeType, Language, Node, Project, Corpus, Document
+from node.models import NodeType, Language, Node, Project, Corpus, Document, DatabaseType
 
 class NodeAdmin(admin.ModelAdmin):
     exclude = ('user', 'path', 'depth', 'numchild')
@@ -50,7 +50,8 @@ class NodeAdmin(admin.ModelAdmin):
                                                 parent  = nodeParent,\
                                                 user    = request.user,\
                                                 name    = obj.name,\
-                                                metadata= obj.metadata)
+                                                metadata= obj.metadata,\
+                                                resource = obj.resource)
             
             #nodeParent.save()
             #node.save()
@@ -109,6 +110,7 @@ class LanguageAdmin(admin.ModelAdmin):
         ordering = ['fullname',]
 
 
+admin.site.register(DatabaseType)
 admin.site.register(NodeType)
 admin.site.register(Language, LanguageAdmin)
 

node/models.py

@@ -60,8 +60,8 @@ class Node(CTENode):
     date        = models.DateField(default=timezone.now, blank=True)
     metadata    = hstore.DictionaryField(blank=True)
     
-    resource    = models.ForeignKey(Resource, blank=True, null=True)
-    ngrams      = models.ManyToManyField(NGram)
+    resource    = models.ManyToManyField(Resource, blank=True)
+    ngrams      = models.ManyToManyField(Ngram, blank=True)
     
     
     def __str__(self):