Updated after global configuration on new git installation

This commit is contained in:
artus40
2016-12-15 18:28:29 +01:00
parent f4bb37ae63
commit ffe73585c6
6 changed files with 17 additions and 21 deletions

View File

@@ -167,8 +167,8 @@ class CompteRenduCreateView(generic.DetailView):
self.form = RencontreForm(*args,
initial=initial)
self.inline_formset = ObservationInlineFormSet(
*args,
instance=self.form.instance,
*args,
instance=self.form.instance
)
def finalize(self):
@@ -203,14 +203,11 @@ class CompteRenduCreateView(generic.DetailView):
rencontre.save()
self.inline_formset.save()
return self.get(request, *args, **kwargs)
return redirect('maraudes:create', pk=self.get_object().pk)
def get(self, request, new_form=True, *args, **kwargs):
try:
if request.GET['finalize'] == "True":
return self.finalize()
except:
pass
if request.GET.get('finalize', False) == "True":
return self.finalize()
def calculate_end_time(debut, duree):
end_minute = debut.minute + duree