From 51e824f8795018cb717a2cc75c391b2e18866f64 Mon Sep 17 00:00:00 2001 From: gw3000 Date: Mon, 19 Jun 2023 23:09:42 +0200 Subject: [PATCH] sorted imports --- fbf/admin.py | 8 +++++++- fbf/models.py | 5 +++-- fbf/templates/fbf/bird_all.html | 4 ++-- fbf/urls.py | 8 ++++---- fbf/views.py | 3 +-- rescuer/views.py | 4 ++++ 6 files changed, 21 insertions(+), 11 deletions(-) diff --git a/fbf/admin.py b/fbf/admin.py index bbe9563..ac6d832 100644 --- a/fbf/admin.py +++ b/fbf/admin.py @@ -5,7 +5,13 @@ from .models import Bird, FallenBird @admin.register(FallenBird) class ContractAdmin(admin.ModelAdmin): - list_display = ["bird", "date_found", "place", "created", "updated", "user"] + list_display = [ + "bird", + "date_found", + "place", + "created", + "updated", + "user"] list_filter = ("bird", "created", "user") diff --git a/fbf/models.py b/fbf/models.py index b40a2c6..e797610 100644 --- a/fbf/models.py +++ b/fbf/models.py @@ -12,8 +12,9 @@ class FallenBird(models.Model): created = models.DateTimeField(auto_now_add=True) updated = models.DateTimeField(auto_now=True) rescuer = models.ForeignKey(Rescuer, on_delete=models.CASCADE) - - user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE) + user = models.ForeignKey( + settings.AUTH_USER_MODEL, + on_delete=models.CASCADE) def __str__(self): return self.place diff --git a/fbf/templates/fbf/bird_all.html b/fbf/templates/fbf/bird_all.html index 52904fb..cf04f06 100644 --- a/fbf/templates/fbf/bird_all.html +++ b/fbf/templates/fbf/bird_all.html @@ -14,7 +14,7 @@ Vogel - Finder + Retter Fundort gefunden am @@ -70,4 +70,4 @@ -{% endblock content %} \ No newline at end of file +{% endblock content %} diff --git a/fbf/urls.py b/fbf/urls.py index 4f96998..b68b634 100644 --- a/fbf/urls.py +++ b/fbf/urls.py @@ -1,19 +1,19 @@ from django.urls import path from .views import ( - bird_create, bird_all, - bird_single, + bird_create, bird_delete, bird_recover, bird_recover_all, + bird_single, ) urlpatterns = [ + path("all/", bird_all, name="bird_all"), path("create/", bird_create, name="bird_create"), path("delete/", bird_delete, name="bird_delete"), - path("recover/all", bird_recover_all, name="bird_recover_all"), path("recover/", bird_recover, name="bird_recover"), - path("all/", bird_all, name="bird_all"), + path("recover/all", bird_recover_all, name="bird_recover_all"), path("/", bird_single, name="bird_single"), ] diff --git a/fbf/views.py b/fbf/views.py index c8a5643..03fc67c 100644 --- a/fbf/views.py +++ b/fbf/views.py @@ -1,10 +1,9 @@ from django.contrib.auth.decorators import login_required from django.shortcuts import HttpResponse, redirect, render -from rescuer.models import Rescuer - from .forms import BirdForm from .models import FallenBird +from rescuer.models import Rescuer @login_required(login_url="account_login") diff --git a/rescuer/views.py b/rescuer/views.py index c09bb21..f40d993 100644 --- a/rescuer/views.py +++ b/rescuer/views.py @@ -1,21 +1,25 @@ +from django.contrib.auth.decorators import login_required from django.shortcuts import render, redirect from .forms import RescuerForm from .models import Rescuer +@login_required(login_url="account_login") def rescuer_all(request): rescuer = Rescuer.objects.all() context = {"rescuer": rescuer} return render(request, "rescuer/rescuer_all.html", context) +@login_required(login_url="account_login") def rescuer_single(request, id): rescuer = Rescuer.objects.get(id=id) context = {"rescuer": rescuer} return render(request, "rescuer/rescuer_single.html", context) +@login_required(login_url="account_login") def rescuer_create(request): form = RescuerForm() if request.method == 'POST':