Commit b94e1170 authored by Administrator's avatar Administrator

Parent hard coded working

parent 17c9256c
...@@ -71,13 +71,13 @@ class CorpusAdmin(admin.ModelAdmin): ...@@ -71,13 +71,13 @@ class CorpusAdmin(admin.ModelAdmin):
#importateur.importer(obj) #importateur.importer(obj)
except Exception as e: except Exception as e:
print("Error importateur", e) print("Error importateur", e)
class DocumentAdmin(admin.ModelAdmin): class DocumentAdmin(admin.ModelAdmin):
exclude = ('user',) exclude = ('user',)
list_display = ('date', 'source', 'title') list_display = ('date', 'source', 'title')
list_per_page = 20 list_per_page = 20
list_filter = ('project', 'corpus') list_filter = ('project', 'corpus')
search_fields = ('title',) search_fields = ('title',)
def has_change_permission(self, request, obj=None): def has_change_permission(self, request, obj=None):
has_class_permission = super(DocumentAdmin, self).has_change_permission(request, obj) has_class_permission = super(DocumentAdmin, self).has_change_permission(request, obj)
......
from django.contrib import admin from django.contrib import admin
from django import forms
from node.models import NodeType, Node, Project, Corpus, Document from node.models import NodeType, Node, Project, Corpus, Document
class NodeAdmin(admin.ModelAdmin): class NodeAdmin(admin.ModelAdmin):
exclude = ('user', 'type', 'path', 'depth', 'numchild') exclude = ('user', 'type', 'path', 'depth', 'numchild')
list_display = ('name', 'date', 'file') list_display = ('name', 'date', 'file')
...@@ -37,17 +39,17 @@ class NodeAdmin(admin.ModelAdmin): ...@@ -37,17 +39,17 @@ class NodeAdmin(admin.ModelAdmin):
nodeTypeParent = NodeType.objects.get(name=self._parent_nodetype_name) nodeTypeParent = NodeType.objects.get(name=self._parent_nodetype_name)
try: try:
nodeParent = Node.objects.get(type = nodeTypeParent, user = request.user) nodeParent = Node.objects.get(type = nodeTypeParent, user = request.user)
except: except:
nodeParent = Node.add_root(type = nodeTypeParent, user = request.user) nodeParent = Node.add_root(type = nodeTypeParent, user = request.user)
obj.user = request.user obj.user = request.user
node = nodeParent.add_child(type = nodeType,\ node = nodeParent.add_child(type = nodeType,\
user = request.user,\ user = request.user,\
name=obj.name,\ name = obj.name,\
file=obj.file,\ file = obj.file,\
metadata=obj.metadata) metadata= obj.metadata)
#nodeParent.save() #nodeParent.save()
#node.save() #node.save()
...@@ -57,12 +59,16 @@ class NodeAdmin(admin.ModelAdmin): ...@@ -57,12 +59,16 @@ class NodeAdmin(admin.ModelAdmin):
obj.save() obj.save()
class ProjectAdmin(NodeAdmin): class ProjectAdmin(NodeAdmin):
_parent_nodetype_name = 'Root' _parent_nodetype_name = 'Root'
_nodetype_name = 'Project' _nodetype_name = 'Project'
class CorpusForm(forms.ModelForm):
parent = forms.ModelChoiceField(Node.objects.filter(user_id=1, type_id=2))
class CorpusAdmin(NodeAdmin): class CorpusAdmin(NodeAdmin):
_parent_nodetype_name = 'Project' _parent_nodetype_name = 'Project'
_nodetype_name = 'Corpus' _nodetype_name = 'Corpus'
form = CorpusForm
class DocumentAdmin(NodeAdmin): class DocumentAdmin(NodeAdmin):
_parent_nodetype_name = 'Corpus' _parent_nodetype_name = 'Corpus'
......
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