Commit dd1d3954 authored by Administrator's avatar Administrator

[BUGFIX] Class model, databasetype is not any more but resource.

parent 26593bd2
...@@ -7,7 +7,7 @@ from django.template import Context ...@@ -7,7 +7,7 @@ from django.template import Context
#from documents.models import Project, Corpus, Document #from documents.models import Project, Corpus, Document
from node.models import Language, DatabaseType, Resource from node.models import Language, ResourceType, Resource
from node.models import Node, NodeType, Project, Corpus from node.models import Node, NodeType, Project, Corpus
from node.admin import CorpusForm, ProjectForm, ResourceForm from node.admin import CorpusForm, ProjectForm, ResourceForm
...@@ -143,7 +143,7 @@ def project(request, project_id): ...@@ -143,7 +143,7 @@ def project(request, project_id):
language = None language = None
try: try:
bdd_type = DatabaseType.objects.get(id=str(request.POST['bdd_type'])) bdd_type = ResourceType.objects.get(id=str(request.POST['bdd_type']))
except: except:
bdd_type = None bdd_type = None
......
...@@ -15,9 +15,9 @@ NodeType(name="Document").save() ...@@ -15,9 +15,9 @@ NodeType(name="Document").save()
from node.models import Project from node.models import Project
Project(name="Projet sur les abeilles", user=user, type=type_project).save() Project(name="Projet sur les abeilles", user=user, type=type_project).save()
from node.models import DatabaseType from node.models import ResourceType
for bdd in ['Europresse', 'PubMed', 'Web Of Science (WOS), ISI format']: for bdd in ['Europresse', 'PubMed', 'Web Of Science (WOS), ISI format']:
DatabaseType(name=bdd).save() ResourceType(name=bdd).save()
from node.models import Language from node.models import Language
import pycountry import pycountry
......
...@@ -2,7 +2,7 @@ from django.contrib import admin ...@@ -2,7 +2,7 @@ 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 nested_inlines.admin import NestedModelAdmin, NestedStackedInline, NestedTabularInline
from node.models import NodeType, Language, Node, Project, Corpus, Document, DatabaseType, Resource, Node_Ngram from node.models import NodeType, Language, Node, Project, Corpus, Document, ResourceType, Resource, Node_Ngram
class ResourceInLine(admin.TabularInline): class ResourceInLine(admin.TabularInline):
model = Resource model = Resource
...@@ -129,7 +129,7 @@ class LanguageAdmin(admin.ModelAdmin): ...@@ -129,7 +129,7 @@ class LanguageAdmin(admin.ModelAdmin):
ordering = ['fullname',] ordering = ['fullname',]
admin.site.register(Resource) admin.site.register(Resource)
admin.site.register(DatabaseType) admin.site.register(ResourceType)
admin.site.register(Language, LanguageAdmin) admin.site.register(Language, LanguageAdmin)
admin.site.register(NodeType) admin.site.register(NodeType)
......
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