diff --git a/maraudes/forms.py b/maraudes/forms.py index fce4cc5..a7b8a3f 100644 --- a/maraudes/forms.py +++ b/maraudes/forms.py @@ -33,8 +33,7 @@ class SignalementForm(NoteForm): ObservationInlineFormSet = inlineformset_factory( Rencontre, Observation, form=NoteForm, - extra = 0, - min_num = 1, + extra = 1, ) RencontreInlineFormSet = inlineformset_factory( diff --git a/maraudes/models.py b/maraudes/models.py index 16dc944..48a3866 100644 --- a/maraudes/models.py +++ b/maraudes/models.py @@ -123,6 +123,12 @@ class Maraude(models.Model): def rencontre_count(self): return self.rencontres.count() + def get_observations(self): + observations = [] + for r in self.rencontres.all(): + observations += r.observations.all() + return observations + def get_absolute_url(self): return reverse('maraudes:details', kwargs={'pk': self.id}) diff --git a/maraudes/templates/compte_rendu/compterendu_create.html b/maraudes/templates/compte_rendu/compterendu_create.html index 950073e..0d43c72 100644 --- a/maraudes/templates/compte_rendu/compterendu_create.html +++ b/maraudes/templates/compte_rendu/compterendu_create.html @@ -105,9 +105,9 @@