Commit 607b8c71 authored by Administrator's avatar Administrator

adding path file

parent c57bbc5a
...@@ -3,7 +3,7 @@ from django.contrib import admin ...@@ -3,7 +3,7 @@ from django.contrib import admin
# Register your models here. # Register your models here.
from nested_inlines.admin import NestedModelAdmin, NestedStackedInline, NestedTabularInline from nested_inlines.admin import NestedModelAdmin, NestedStackedInline, NestedTabularInline
from documents.models import Database, Language, Project, Corpus, Document, Ngram, NgramDocument, List, ListNgram from documents.models import Source, Language, Project, Corpus, Document, Ngram, NgramDocument, List, ListNgram
class DocumentInLine(admin.StackedInline): class DocumentInLine(admin.StackedInline):
model = Document model = Document
...@@ -40,10 +40,9 @@ class ProjectAdmin(admin.ModelAdmin): ...@@ -40,10 +40,9 @@ class ProjectAdmin(admin.ModelAdmin):
class CorpusAdmin(admin.ModelAdmin): class CorpusAdmin(admin.ModelAdmin):
exclude = ('analyst',) exclude = ('analyst',)
list_display = ('title', 'date', 'database', 'analyst') list_display = ('title', 'date', 'analyst')
#inlines = [DocumentInLine,] #inlines = [DocumentInLine,]
def has_change_permission(self, request, obj=None): def has_change_permission(self, request, obj=None):
has_class_permission = super(CorpusAdmin, self).has_change_permission(request, obj) has_class_permission = super(CorpusAdmin, self).has_change_permission(request, obj)
if not has_class_permission: if not has_class_permission:
...@@ -104,7 +103,7 @@ class ListNgramAdmin(admin.ModelAdmin): ...@@ -104,7 +103,7 @@ class ListNgramAdmin(admin.ModelAdmin):
list_per_page = 20 list_per_page = 20
admin.site.register(Database) admin.site.register(Source)
admin.site.register(Language) admin.site.register(Language)
admin.site.register(Project, ProjectAdmin) admin.site.register(Project, ProjectAdmin)
......
...@@ -10,6 +10,8 @@ from django_hstore import hstore ...@@ -10,6 +10,8 @@ from django_hstore import hstore
# PROJECT / CORPUS / DOCUMENT # PROJECT / CORPUS / DOCUMENT
###################################################################### ######################################################################
def upload_to(instance, filename):
return 'images/%s/%s' % (instance.user.user.username, filename)
class Source(models.Model): class Source(models.Model):
""" """
...@@ -56,7 +58,7 @@ class Corpus(models.Model): ...@@ -56,7 +58,7 @@ class Corpus(models.Model):
title = models.CharField(max_length=300, blank=True) title = models.CharField(max_length=300, blank=True)
subtitle = models.CharField(max_length=300, blank=True) subtitle = models.CharField(max_length=300, blank=True)
zip_file = models.FileField(upload_to='documents', blank=True) zip_file = models.FileField(upload_to=upload_to, blank=True)
others = hstore.DictionaryField(blank=True, null=True) others = hstore.DictionaryField(blank=True, null=True)
objects = hstore.HStoreManager() objects = hstore.HStoreManager()
......
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