import Europresse to database web ok

documents/admin.py

@@ -7,7 +7,7 @@ from documents.models import Database, Language, Project, Corpus, Document
 
 class DocumentInLine(NestedStackedInline):
     model = Document
-    extra = 1
+    extra = 0
 
 class CorpusInLine(NestedStackedInline):
     model = Corpus
@@ -41,7 +41,7 @@ class ProjectAdmin(NestedModelAdmin):
 
 class CorpusAdmin(admin.ModelAdmin):
     exclude = ('analyst',)
-    list_display = ('title', 'date', 'analyst')
+    list_display = ('analyst', 'database', 'date', 'title')
     inlines = [DocumentInLine,]
 
 
@@ -64,36 +64,37 @@ class CorpusAdmin(admin.ModelAdmin):
             obj.analyst = request.user
         obj.save()
 
-#
-#class DocumentAdmin(admin.ModelAdmin):
-#    exclude = ('analyst',)
-#    list_display = ('date', 'source', 'title')
-#
-#
-#    def has_change_permission(self, request, obj=None):
-#        has_class_permission = super(DocumentAdmin, self).has_change_permission(request, obj)
-#        if not has_class_permission:
-#            return False
-#        if obj is not None and not request.user.is_superuser and request.user.id != obj.analyst.id:
-#            return False
-#        return True
-#
-#    def get_queryset(self, request):
-#        if request.user.is_superuser:
-#            return Document.objects.all()
-#        
-#        return Document.objects.filter(analyst=request.user)
-#
-#    def save_model(self, request, obj, form, change):
-#        if not change:
-#            obj.analyst = request.user
-#        obj.save()
-#
+
+class DocumentAdmin(admin.ModelAdmin):
+    exclude = ('analyst',)
+    list_display = ('date', 'source', 'title')
+    list_per_page = 20
+
+
+    def has_change_permission(self, request, obj=None):
+        has_class_permission = super(DocumentAdmin, self).has_change_permission(request, obj)
+        if not has_class_permission:
+            return False
+        if obj is not None and not request.user.is_superuser and request.user.id != obj.analyst.id:
+            return False
+        return True
+
+    def get_queryset(self, request):
+        if request.user.is_superuser:
+            return Document.objects.all()
+        
+        return Document.objects.filter(analyst=request.user)
+
+    def save_model(self, request, obj, form, change):
+        if not change:
+            obj.analyst = request.user
+        obj.save()
+
 admin.site.register(Database)
 admin.site.register(Language)
 
 admin.site.register(Project, ProjectAdmin)
 admin.site.register(Corpus, CorpusAdmin)
-#admin.site.register(Document, DocumentAdmin)
+admin.site.register(Document, DocumentAdmin)
 
 

settings.py

@@ -37,6 +37,7 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'django_extensions',
     #'south',
     'documents',
     'django_hstore',