Commit 4b397ad5 authored by Administrator's avatar Administrator

Adding admin register to ngrams

parent c0318cc8
from django.contrib import admin from django.contrib import admin
# Register your models here. from ngram.models import Ngram, NodeNgram, NodeNgramNgram
admin.site.register(Ngram)
admin.site.register(NodeNgram)
admin.site.register(NodeNgramNgram)
...@@ -9,14 +9,12 @@ class Ngram(models.Model): ...@@ -9,14 +9,12 @@ class Ngram(models.Model):
def __str__(self): def __str__(self):
return "[%d] %s" % (self.pk, self.terms) return "[%d] %s" % (self.pk, self.terms)
class NodeNgram(models.Model): class NodeNgram(models.Model):
node = models.ForeignKey(Node) node = models.ForeignKey(Node)
ngram = models.ForeignKey(Ngram, related_name="nodengram") ngram = models.ForeignKey(Ngram, related_name="nodengram")
def __str__(self): def __str__(self):
return "%s: %s" % (self.node.name, self.ngram.terms) return "%s: %s" % (self.node.name, self.ngram.terms)
class NodeNgramNgram(models.Model): class NodeNgramNgram(models.Model):
node = models.ForeignKey(Node) node = models.ForeignKey(Node)
......
...@@ -74,8 +74,8 @@ class DocumentAdmin(NodeAdmin): ...@@ -74,8 +74,8 @@ class DocumentAdmin(NodeAdmin):
admin.site.register(NodeType) 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)
admin.site.register(Node) admin.site.register(Node)
admin.site.register(Ngram) admin.site.register(Ngram)
......
from django.db import models from django.db import models
from django.utils import timezone from django.utils import timezone
from django.contrib.auth.models import User from django.contrib.auth.models import User
...@@ -17,7 +16,6 @@ class NodeType(models.Model): ...@@ -17,7 +16,6 @@ class NodeType(models.Model):
def __str__(self): def __str__(self):
return self.name return self.name
class Node(MP_Node): class Node(MP_Node):
#parent = models.ForeignKey('self', related_name='children_set', null=True, db_index=True) #parent = models.ForeignKey('self', related_name='children_set', null=True, db_index=True)
user = models.ForeignKey(User) user = models.ForeignKey(User)
...@@ -45,5 +43,3 @@ class Document(Node): ...@@ -45,5 +43,3 @@ class Document(Node):
proxy=True proxy=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