Просмотр исходного кода

Fixes #8226: Honor return URL after populating a device bay

jeremystretch 4 лет назад
Родитель
Сommit
8c8774cd2f
3 измененных файлов с 4 добавлено и 2 удалено
  1. 1 0
      docs/release-notes/version-3.1.md
  2. 2 1
      netbox/dcim/views.py
  3. 1 1
      netbox/templates/dcim/devicebay_populate.html

+ 1 - 0
docs/release-notes/version-3.1.md

@@ -5,6 +5,7 @@
 ### Bug Fixes
 ### Bug Fixes
 
 
 * [#8213](https://github.com/netbox-community/netbox/issues/8213) - Fix ValueError exception under prefix IP addresses view
 * [#8213](https://github.com/netbox-community/netbox/issues/8213) - Fix ValueError exception under prefix IP addresses view
+* [#8226](https://github.com/netbox-community/netbox/issues/8226) - Honor return URL after populating a device bay
 
 
 ---
 ---
 
 

+ 2 - 1
netbox/dcim/views.py

@@ -2035,8 +2035,9 @@ class DeviceBayPopulateView(generic.ObjectEditView):
             device_bay.installed_device = form.cleaned_data['installed_device']
             device_bay.installed_device = form.cleaned_data['installed_device']
             device_bay.save()
             device_bay.save()
             messages.success(request, "Added {} to {}.".format(device_bay.installed_device, device_bay))
             messages.success(request, "Added {} to {}.".format(device_bay.installed_device, device_bay))
+            return_url = self.get_return_url(request)
 
 
-            return redirect('dcim:device', pk=device_bay.device.pk)
+            return redirect(return_url)
 
 
         return render(request, 'dcim/devicebay_populate.html', {
         return render(request, 'dcim/devicebay_populate.html', {
             'device_bay': device_bay,
             'device_bay': device_bay,

+ 1 - 1
netbox/templates/dcim/devicebay_populate.html

@@ -4,7 +4,7 @@
 {% render_errors form %}
 {% render_errors form %}
 
 
 {% block content %}
 {% block content %}
-<form action="." method="post">
+<form action="" method="post">
     {% csrf_token %}
     {% csrf_token %}
     <div class="row mb-3">
     <div class="row mb-3">
         <div class="col col-md-6 offset-md-3">
         <div class="col col-md-6 offset-md-3">