|
@@ -53,7 +53,7 @@ class ServiceAllocate(PermissionRequiredMixin, CreateView):
|
|
|
kwargs['initial'].update({'service': service.pk})
|
|
|
form = self.get_form_class()(**kwargs)
|
|
|
form.fields['service'].disabled = True
|
|
|
- form.fields['resource'].queryset = IPResource.objects.exclude(get_active_filter('allocation'))
|
|
|
+ form.fields['resource'].queryset = IPResource.objects.filter(reserved=False).exclude(get_active_filter('allocation'))
|
|
|
return form
|
|
|
|
|
|
def get_success_url(self):
|
|
@@ -107,7 +107,9 @@ class IPResourceAllocate(PermissionRequiredMixin, CreateView):
|
|
|
def get(self, request, *args, **kwargs):
|
|
|
resource = get_object_or_404(IPResource, pk=self.kwargs['pk'])
|
|
|
if resource.in_use:
|
|
|
- return HttpResponseGone("Cette IP est déjà alloué !")
|
|
|
+ return HttpResponseGone("Cette IP est déjà allouée !")
|
|
|
+ if resource.reserved:
|
|
|
+ return HttpResponseGone("Cette IP est réservée !")
|
|
|
return super().get(request, *args, **kwargs)
|
|
|
|
|
|
def get_form(self):
|