adapting resource

node/admin.py

@@ -4,8 +4,8 @@ from django.forms import ModelForm, ModelChoiceField
 from node.models import NodeType, Language, Node, Project, Corpus, Document
 
 class NodeAdmin(admin.ModelAdmin):
-    exclude = ('user', 'type', 'path', 'depth', 'numchild')
-    list_display = ('name', 'date', 'file')
+    exclude = ('user', 'path', 'depth', 'numchild')
+    list_display = ('name', 'date')
     search_fields = ('name',)
     # list_filter = ('type',)
     # date_hierarchy
@@ -49,7 +49,6 @@ class NodeAdmin(admin.ModelAdmin):
                                                 parent  = nodeParent,\
                                                 user    = request.user,\
                                                 name    = obj.name,\
-                                                file    = obj.file,\
                                                 metadata= obj.metadata)
             
             #nodeParent.save()
@@ -69,7 +68,6 @@ class ProjectAdmin(NodeAdmin):
 
 from django.db.models.query import EmptyQuerySet
 
-
 class CorpusForm(ModelForm):
     parent = ModelChoiceField(EmptyQuerySet)
     
@@ -106,7 +104,6 @@ class LanguageAdmin(admin.ModelAdmin):
     
     def get_queryset(self, request):
         return Language.objects.filter(implemented=1)
-
     
     class Meta:
         ordering = ['fullname',]

node/models.py

@@ -39,6 +39,7 @@ class Ngram(models.Model):
 
 class Resource(models.Model):
     guid        = models.CharField(max_length=255)
+    bdd_type    = models.ForeignKey(DatabaseType, blank=True, null=True)
     file        = models.FileField(upload_to=upload_to, blank=True)
 
 class NodeType(models.Model):
@@ -58,13 +59,7 @@ class Node(CTENode):
     date        = models.DateField(default=timezone.now, blank=True)
     metadata    = hstore.DictionaryField(blank=True)
     
-    # the 'file' column should be deprecated soon;
-    # use resources instead.
-    file        = models.FileField(upload_to=upload_to, blank=True)
-    bdd_type    = models.ForeignKey(DatabaseType, blank=True, null=True)
-    
-    #resources   = models.ManyToManyField(Resource)
-    #resource    = models.ForeignKey(Resource, blank=True, null=True)
+    resource    = models.ForeignKey(Resource, blank=True, null=True)
     #ngrams      = models.ManyToManyField(NGrams)