From 4ba635a3ed914ab7697d3a40aecf4659ec85eb1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20=20MENAGER?= <herve.menager@pasteur.fr> Date: Tue, 18 Apr 2017 18:01:37 +0200 Subject: [PATCH] remove outdated bibliography views which interfere with the admin model. --- ippisite/ippidb/models.py | 3 --- .../templates/ippidb/bibliography_detail.html | 19 -------------- .../templates/ippidb/bibliography_form.html | 10 ------- .../templates/ippidb/bibliography_list.html | 11 -------- ippisite/ippidb/urls.py | 7 ----- ippisite/ippidb/views.py | 26 ------------------- 6 files changed, 76 deletions(-) delete mode 100644 ippisite/ippidb/templates/ippidb/bibliography_detail.html delete mode 100644 ippisite/ippidb/templates/ippidb/bibliography_form.html delete mode 100644 ippisite/ippidb/templates/ippidb/bibliography_list.html diff --git a/ippisite/ippidb/models.py b/ippisite/ippidb/models.py index 73de8458..7861325a 100644 --- a/ippisite/ippidb/models.py +++ b/ippisite/ippidb/models.py @@ -27,9 +27,6 @@ class Bibliography(models.Model): pharmacokinetic = models.BooleanField('pharmacokinetic study performed', default=False) xray = models.BooleanField('contains xray data', default=False) - def get_absolute_url(self): - return reverse('bibliography-detail', args=[str(self.id)]) - def save(self, *args, **kwargs): if self.source == 'PM': info = get_pubmed_info(self.id_source) diff --git a/ippisite/ippidb/templates/ippidb/bibliography_detail.html b/ippisite/ippidb/templates/ippidb/bibliography_detail.html deleted file mode 100644 index 16ae53bf..00000000 --- a/ippisite/ippidb/templates/ippidb/bibliography_detail.html +++ /dev/null @@ -1,19 +0,0 @@ -{% extends "base.html" %} - -{% block title %}- biblio detail for {{object.title}} by {{object.authors_list}}{% endblock %} - -{% block content %} - <p>{{ object.get_source_display }}</p> - <p>{{ object.id_source}}</p> - <p>{{ object.title }}</p> - <p>{{ object.journal_name }}</p> - <p>{{ object.authors_list }}</p> - <p>{{ object.biblio_year }}</p> - <p>{{ object.cytotox }}</p> - <p>{{ object.in_silico }}</p> - <p>{{ object.in_vitro }}</p> - <p>{{ object.in_vivo }}</p> - <p>{{ object.in_cellulo }}</p> - <p>{{ object.pharmacokinetic }}</p> - <p>{{ object.xray }}</p> -{% endblock %} diff --git a/ippisite/ippidb/templates/ippidb/bibliography_form.html b/ippisite/ippidb/templates/ippidb/bibliography_form.html deleted file mode 100644 index a398e6ae..00000000 --- a/ippisite/ippidb/templates/ippidb/bibliography_form.html +++ /dev/null @@ -1,10 +0,0 @@ -{% extends "base.html" %} -{% load bootstrap3 %} - -{% block title %}- biblio edition{% endblock %} - -{% block content %} - {% csrf_token %} - {% bootstrap_form form %} - <input type="submit" name="submit" value="Save" /> -{% endblock %} diff --git a/ippisite/ippidb/templates/ippidb/bibliography_list.html b/ippisite/ippidb/templates/ippidb/bibliography_list.html deleted file mode 100644 index c19d5653..00000000 --- a/ippisite/ippidb/templates/ippidb/bibliography_list.html +++ /dev/null @@ -1,11 +0,0 @@ -{% extends "base.html" %} - -{% block title %}- biblios list{% endblock %} - -{% block content %} - {% for biblio in object_list %} - <li><a href="{{biblio.get_absolute_url}}">{{ biblio.get_source_display }} {{ biblio.id_source}} - {{ biblio.title }}</a></li> - {% empty %} - <li>No articles yet.</li> - {% endfor %} -{% endblock %} diff --git a/ippisite/ippidb/urls.py b/ippisite/ippidb/urls.py index 06e4b130..ceb170ff 100644 --- a/ippisite/ippidb/urls.py +++ b/ippisite/ippidb/urls.py @@ -1,11 +1,4 @@ from django.conf.urls import url -from .views import BibliographyCreate, BibliographyUpdate, BibliographyDelete, BibliographyDetail, BibliographyList - urlpatterns = [ - url(r'biblio/$', BibliographyList.as_view(), name='list'), - url(r'biblio/add/$', BibliographyCreate.as_view(), name='biblio-add'), - url(r'biblio/(?P<pk>[0-9]+)/$', BibliographyDetail.as_view(), name='biblio-detail'), - url(r'biblio/(?P<pk>[0-9]+)/edit/$', BibliographyUpdate.as_view(), name='biblio-update'), - url(r'biblio/(?P<pk>[0-9]+)/delete/$', BibliographyDelete.as_view(), name='biblio-delete'), ] diff --git a/ippisite/ippidb/views.py b/ippisite/ippidb/views.py index c7056141..e69de29b 100644 --- a/ippisite/ippidb/views.py +++ b/ippisite/ippidb/views.py @@ -1,26 +0,0 @@ -from django.http import HttpResponse -from django.views.generic.edit import CreateView, UpdateView, DeleteView -from django.views.generic.detail import DetailView -from django.views.generic import ListView -from django.urls import reverse_lazy -from .models import Bibliography, BibliographyForm - -class BibliographyCreate(CreateView): - model = Bibliography - form_class = BibliographyForm - -class BibliographyUpdate(UpdateView): - model = Bibliography - form_class = BibliographyForm - -class BibliographyDelete(DeleteView): - model = Bibliography - success_url = reverse_lazy('biblio-list') - -class BibliographyDetail(DetailView): - model = Bibliography - fields = '__all__' - -class BibliographyList(ListView): - model = Bibliography - -- GitLab