From dd9c8018ad4b22dfac7a0c67a03b66a7165f3915 Mon Sep 17 00:00:00 2001 From: Ross Date: Sun, 5 Dec 2021 15:17:57 +0000 Subject: [PATCH] . --- atlas/forms.py | 4 ++++ atlas/templates/atlas/condition_detail.html | 2 +- atlas/urls.py | 4 +++- atlas/views.py | 19 +++++++++++++++++++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/atlas/forms.py b/atlas/forms.py index 788e47d6..73a492b5 100755 --- a/atlas/forms.py +++ b/atlas/forms.py @@ -24,6 +24,10 @@ from tinymce.widgets import TinyMCE from dal import autocomplete +class ConditionForm(ModelForm): + class Meta: + model = Condition + exclude = [] class SeriesFindingForm(ModelForm): class Meta: diff --git a/atlas/templates/atlas/condition_detail.html b/atlas/templates/atlas/condition_detail.html index a367c3b6..1ab6fbf0 100755 --- a/atlas/templates/atlas/condition_detail.html +++ b/atlas/templates/atlas/condition_detail.html @@ -13,7 +13,7 @@
{{condition.name}}
- {{condition.primary}}
+ {{condition.primary}}
{{condition.synonym}}
diff --git a/atlas/urls.py b/atlas/urls.py index 01f695da..842deadf 100755 --- a/atlas/urls.py +++ b/atlas/urls.py @@ -11,7 +11,9 @@ urlpatterns = [ path("author/", views.author_list, name="author_list"), path("cases/", views.CaseView.as_view(), name="case_view"), path("condition/", views.ConditionView.as_view(), name="condition_view"), - path("condition/", views.condition_detail, name="condition_detail"), + path("condition/", views.condition_detail, name="condition_detail"), + path("condition//delete", views.ConditionDelete.as_view(), name="condition_delete"), + path("condition//update", views.ConditionUpdate.as_view(), name="condition_update"), path("series/", views.series_detail, name="series_detail"), path("series/", views.SeriesView.as_view(), name="series_view"), path("series/", views.series_detail, name="series_detail"), diff --git a/atlas/views.py b/atlas/views.py index 5b147a16..75c546e2 100755 --- a/atlas/views.py +++ b/atlas/views.py @@ -28,6 +28,7 @@ from django.http import HttpResponseRedirect, HttpResponse from .forms import ( CaseForm, + ConditionForm, SeriesForm, SeriesImageFormSet, SeriesFormSet, @@ -195,6 +196,17 @@ class SeriesDelete(RevisionMixin, AuthorOrCheckerRequiredMixin, DeleteView): model = Series success_url = reverse_lazy("atlas:series_view") +class ConditionDelete(RevisionMixin, AuthorOrCheckerRequiredMixin, DeleteView): + model = Condition + success_url = reverse_lazy("atlas:condition_view") + +class FindingDelete(RevisionMixin, AuthorOrCheckerRequiredMixin, DeleteView): + model = Finding + success_url = reverse_lazy("atlas:finding_view") + +class StructureDelete(RevisionMixin, AuthorOrCheckerRequiredMixin, DeleteView): + model = Structure + success_url = reverse_lazy("atlas:structure_view") @login_required @user_is_author_or_atlas_checker @@ -315,6 +327,13 @@ class SeriesUpdate( return super().form_invalid(form) +class ConditionUpdate( + RevisionMixin, LoginRequiredMixin, AuthorOrCheckerRequiredMixin, UpdateView +): + model = Condition + form_class = ConditionForm + + class AtlasCreateBase(RevisionMixin, LoginRequiredMixin): model = Case form_class = CaseForm