beautified code
This commit is contained in:
parent
27802b317d
commit
d8ba98366f
5 changed files with 30 additions and 28 deletions
|
@ -2,5 +2,5 @@ from django.apps import AppConfig
|
|||
|
||||
|
||||
class BirdConfig(AppConfig):
|
||||
default_auto_field = 'django.db.models.BigAutoField'
|
||||
name = 'bird'
|
||||
default_auto_field = "django.db.models.BigAutoField"
|
||||
name = "bird"
|
||||
|
|
|
@ -10,12 +10,18 @@ class DateInput(forms.DateInput):
|
|||
|
||||
class BirdAddForm(forms.ModelForm):
|
||||
class Meta:
|
||||
widgets = {
|
||||
"date_found": DateInput()}
|
||||
widgets = {"date_found": DateInput()}
|
||||
model = FallenBird
|
||||
fields = ["bird", "date_found", "place", ]
|
||||
labels = {"bird": _("Vogel"), "date_found": _(
|
||||
"Datum des Fundes"), "place": _("Fundort")}
|
||||
fields = [
|
||||
"bird",
|
||||
"date_found",
|
||||
"place",
|
||||
]
|
||||
labels = {
|
||||
"bird": _("Vogel"),
|
||||
"date_found": _("Datum des Fundes"),
|
||||
"place": _("Fundort"),
|
||||
}
|
||||
|
||||
|
||||
class BirdEditForm(forms.ModelForm):
|
||||
|
|
|
@ -14,9 +14,7 @@ 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
|
||||
|
|
|
@ -16,7 +16,7 @@ def bird_create(request):
|
|||
# just show only related rescuers in select field of the form
|
||||
if request.method == "POST":
|
||||
form = BirdAddForm(request.POST or None, request.FILES or None)
|
||||
rescuer_id = request.session.get('rescuer_id')
|
||||
rescuer_id = request.session.get("rescuer_id")
|
||||
rescuer = Rescuer.objects.get(id=rescuer_id, user=request.user)
|
||||
|
||||
if form.is_valid():
|
||||
|
@ -54,10 +54,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():
|
||||
form.save()
|
||||
|
|
|
@ -5,12 +5,12 @@ from .models import Rescuer
|
|||
|
||||
|
||||
class DateInput(forms.DateInput):
|
||||
input_type = 'date'
|
||||
input_type = "date"
|
||||
|
||||
|
||||
class RescuerForm(forms.ModelForm):
|
||||
class Meta:
|
||||
widgets = {'date_of_birth': DateInput()}
|
||||
widgets = {"date_of_birth": DateInput()}
|
||||
model = Rescuer
|
||||
fields = [
|
||||
"gender",
|
||||
|
@ -22,16 +22,17 @@ class RescuerForm(forms.ModelForm):
|
|||
"city",
|
||||
"state",
|
||||
"date_of_birth",
|
||||
"email"]
|
||||
"email",
|
||||
]
|
||||
labels = {
|
||||
'gender': _('Geschlecht'),
|
||||
'first_name': _('Vorname'),
|
||||
'last_name': _('Nachname'),
|
||||
'date_of_birth': _('Geburtstag'),
|
||||
'street': _('Straße'),
|
||||
'street_number': _('Hausnummer'),
|
||||
'zip_code': _('Postleitzahl'),
|
||||
'city': _('Stadt'),
|
||||
'state': _('Land'),
|
||||
'email': _('Email'),
|
||||
"gender": _("Geschlecht"),
|
||||
"first_name": _("Vorname"),
|
||||
"last_name": _("Nachname"),
|
||||
"date_of_birth": _("Geburtstag"),
|
||||
"street": _("Straße"),
|
||||
"street_number": _("Hausnummer"),
|
||||
"zip_code": _("Postleitzahl"),
|
||||
"city": _("Stadt"),
|
||||
"state": _("Land"),
|
||||
"email": _("Email"),
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue