Commit 2059280d authored by Administrator's avatar Administrator

[BUGFIX] MODELS Resource not already registered any more.

parent 76f7db45
...@@ -2,7 +2,7 @@ from django.contrib import admin ...@@ -2,7 +2,7 @@ from django.contrib import admin
from django.forms import ModelForm, ModelChoiceField from django.forms import ModelForm, ModelChoiceField
from nested_inlines.admin import NestedModelAdmin, NestedStackedInline, NestedTabularInline from nested_inlines.admin import NestedModelAdmin, NestedStackedInline, NestedTabularInline
from node.models import NodeType, Language, Node, Project, Corpus, Document, ResourceType, Resource, Node_Ngram from node.models import NodeType, Language, Node, Project, Corpus, Document, ResourceType, Resource, Node_Ngram, Node_Resource
class ResourceInLine(admin.TabularInline): class ResourceInLine(admin.TabularInline):
model = Resource model = Resource
...@@ -78,7 +78,7 @@ from django.db.models.query import EmptyQuerySet ...@@ -78,7 +78,7 @@ from django.db.models.query import EmptyQuerySet
class ProjectForm(ModelForm): class ProjectForm(ModelForm):
class Meta: class Meta:
model = Project model = Project
exclude = ['ngrams', 'metadata', 'resource', 'parent', 'user', 'type', 'language', 'date'] exclude = ['ngrams', 'metadata', 'parent', 'user', 'type', 'language', 'date']
class ResourceForm(ModelForm): class ResourceForm(ModelForm):
class Meta: class Meta:
...@@ -103,7 +103,7 @@ class CorpusForm(ModelForm): ...@@ -103,7 +103,7 @@ class CorpusForm(ModelForm):
class Meta: class Meta:
model = Corpus model = Corpus
exclude = ['parent', 'user', 'type', 'ngrams', 'metadata', 'resource', 'date'] exclude = ['parent', 'user', 'type', 'ngrams', 'metadata', 'date']
class CorpusAdmin(NodeAdmin): class CorpusAdmin(NodeAdmin):
_parent_nodetype_name = 'Project' _parent_nodetype_name = 'Project'
...@@ -137,5 +137,6 @@ admin.site.register(Project, ProjectAdmin) ...@@ -137,5 +137,6 @@ admin.site.register(Project, ProjectAdmin)
admin.site.register(Corpus, CorpusAdmin) admin.site.register(Corpus, CorpusAdmin)
admin.site.register(Document, DocumentAdmin) admin.site.register(Document, DocumentAdmin)
admin.site.register(Node_Resource)
admin.site.register(Node_Ngram) admin.site.register(Node_Ngram)
...@@ -86,7 +86,7 @@ class Node(CTENode): ...@@ -86,7 +86,7 @@ class Node(CTENode):
metadata = hstore.DictionaryField(blank=True) metadata = hstore.DictionaryField(blank=True)
# TODO: remove the three following fields # TODO: remove the three following fields
fichier = models.FileField(upload_to=upload_to, blank=True) #fichier = models.FileField(upload_to=upload_to, blank=True)
#resource = models.ForeignKey(Resource, blank=True, null=True) #resource = models.ForeignKey(Resource, blank=True, null=True)
#ngrams = models.ManyToManyField(NGrams) #ngrams = models.ManyToManyField(NGrams)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment