parent
473a21cad0
commit
6387e45434
4 changed files with 19 additions and 18 deletions
|
@ -50,9 +50,11 @@ def bird_help_single(request, id):
|
|||
|
||||
@login_required(login_url="account_login")
|
||||
def bird_all(request):
|
||||
birds = FallenBird.objects.filter(Q(status="1") | Q(status="2")).annotate(
|
||||
total_costs=Sum("costs__costs")
|
||||
).order_by("date_found")
|
||||
birds = (
|
||||
FallenBird.objects.filter(Q(status="1") | Q(status="2"))
|
||||
.annotate(total_costs=Sum("costs__costs"))
|
||||
.order_by("date_found")
|
||||
)
|
||||
rescuer_modal = Rescuer.objects.all()
|
||||
context = {"birds": birds, "rescuer_modal": rescuer_modal}
|
||||
# Post came from the modal form.
|
||||
|
@ -68,9 +70,11 @@ def bird_all(request):
|
|||
|
||||
@login_required(login_url="account_login")
|
||||
def bird_inactive(request):
|
||||
birds = FallenBird.objects.filter(
|
||||
~Q(status="1") & ~Q(status="2")).annotate(
|
||||
total_costs=Sum("costs__costs"))
|
||||
birds = (
|
||||
FallenBird.objects.filter(~Q(status="1") & ~Q(status="2"))
|
||||
.annotate(total_costs=Sum("costs__costs"))
|
||||
.order_by("date_found")
|
||||
)
|
||||
context = {"birds": birds}
|
||||
return render(request, "bird/bird_inactive.html", context)
|
||||
|
||||
|
@ -83,10 +87,7 @@ def bird_recover_all(request):
|
|||
@login_required(login_url="account_login")
|
||||
def bird_single(request, id):
|
||||
bird = FallenBird.objects.get(id=id)
|
||||
form = BirdEditForm(
|
||||
request.POST or None,
|
||||
request.FILES or None,
|
||||
instance=bird)
|
||||
form = BirdEditForm(request.POST or None, request.FILES or None, instance=bird)
|
||||
if request.method == "POST":
|
||||
if form.is_valid():
|
||||
fs = form.save(commit=False)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue