Commit afd763af authored by Administrator's avatar Administrator

[features][node model] adding user to resource

parent 2fb1dfaa
from django.contrib import admin 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 node.models import NodeType, Language, Node, Project, Corpus, Document, DatabaseType from node.models import NodeType, Language, Node, Project, Corpus, Document, DatabaseType, Resource
class ResourceInLine(admin.TabularInline):
model = Resource
extra = 0
class NodeAdmin(admin.ModelAdmin): class NodeAdmin(admin.ModelAdmin):
exclude = ('user', 'path', 'depth', 'numchild') exclude = ('user', 'path', 'depth', 'numchild')
...@@ -9,7 +14,7 @@ class NodeAdmin(admin.ModelAdmin): ...@@ -9,7 +14,7 @@ class NodeAdmin(admin.ModelAdmin):
search_fields = ('name',) search_fields = ('name',)
# list_filter = ('type',) # list_filter = ('type',)
# date_hierarchy # date_hierarchy
# inlines = [CorpusInLine,] #inlines = [ResourceInLine,]
#_nodetype_name = 'Project' #_nodetype_name = 'Project'
#_parent_nodetype_name = 'Root' #_parent_nodetype_name = 'Root'
...@@ -109,11 +114,11 @@ class LanguageAdmin(admin.ModelAdmin): ...@@ -109,11 +114,11 @@ class LanguageAdmin(admin.ModelAdmin):
class Meta: class Meta:
ordering = ['fullname',] ordering = ['fullname',]
admin.site.register(Resource)
admin.site.register(DatabaseType) admin.site.register(DatabaseType)
admin.site.register(NodeType)
admin.site.register(Language, LanguageAdmin) admin.site.register(Language, LanguageAdmin)
admin.site.register(NodeType)
admin.site.register(Project, ProjectAdmin) 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)
......
...@@ -39,6 +39,7 @@ class Ngram(models.Model): ...@@ -39,6 +39,7 @@ class Ngram(models.Model):
terms = models.CharField(max_length=255) terms = models.CharField(max_length=255)
class Resource(models.Model): class Resource(models.Model):
user = models.ForeignKey(User)
guid = models.CharField(max_length=255) guid = models.CharField(max_length=255)
bdd_type = models.ForeignKey(DatabaseType, blank=True, null=True) bdd_type = models.ForeignKey(DatabaseType, blank=True, null=True)
file = models.FileField(upload_to=upload_to, blank=True) file = models.FileField(upload_to=upload_to, blank=True)
......
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