Fix up device component tab navigation & return URLs

This commit is contained in:
Jeremy Stretch
2020-11-10 11:46:04 -05:00
parent aac930237a
commit 2377e04911
4 changed files with 49 additions and 42 deletions

View File

@@ -1747,7 +1747,7 @@ class DeviceBayPopulateView(ObjectEditView):
return render(request, 'dcim/devicebay_populate.html', {
'device_bay': device_bay,
'form': form,
'return_url': reverse('dcim:device', kwargs={'pk': device_bay.device.pk}),
'return_url': self.get_return_url(request, device_bay),
})
def post(self, request, pk):
@@ -1765,7 +1765,7 @@ class DeviceBayPopulateView(ObjectEditView):
return render(request, 'dcim/devicebay_populate.html', {
'device_bay': device_bay,
'form': form,
'return_url': reverse('dcim:device', kwargs={'pk': device_bay.device.pk}),
'return_url': self.get_return_url(request, device_bay),
})
@@ -1773,18 +1773,16 @@ class DeviceBayDepopulateView(ObjectEditView):
queryset = DeviceBay.objects.all()
def get(self, request, pk):
device_bay = get_object_or_404(self.queryset, pk=pk)
form = ConfirmationForm()
return render(request, 'dcim/devicebay_depopulate.html', {
'device_bay': device_bay,
'form': form,
'return_url': reverse('dcim:device', kwargs={'pk': device_bay.device.pk}),
'return_url': self.get_return_url(request, device_bay),
})
def post(self, request, pk):
device_bay = get_object_or_404(self.queryset, pk=pk)
form = ConfirmationForm(request.POST)
@@ -1800,7 +1798,7 @@ class DeviceBayDepopulateView(ObjectEditView):
return render(request, 'dcim/devicebay_depopulate.html', {
'device_bay': device_bay,
'form': form,
'return_url': reverse('dcim:device', kwargs={'pk': device_bay.device.pk}),
'return_url': self.get_return_url(request, device_bay),
})