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

Merge pull request #7115 from sdktr/7113-fix-prefix-iprange-bulkedit

Fixes #7113: iprange bulk options within Prefix view
Jeremy Stretch 4 лет назад
Родитель
Сommit
29eb2383d6

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

@@ -24,6 +24,7 @@
 * [#7106](https://github.com/netbox-community/netbox/issues/7106) - Fix incorrect "Map It" button URL on a site's Physical Address field
 * [#7107](https://github.com/netbox-community/netbox/issues/7107) - Fix missing search button and search results in IP Address assignment "Assign IP" tab
 * [#7109](https://github.com/netbox-community/netbox/issues/7109) - Ensure human readability of exceptions raised during REST API requests
+* [#7113](https://github.com/netbox-community/netbox/issues/7113) - Fix IPRange bulk options within Prefix view
 
 ---
 

+ 8 - 0
netbox/ipam/views.py

@@ -427,8 +427,16 @@ class PrefixIPRangesView(generic.ObjectView):
 
         bulk_querystring = 'vrf_id={}&parent={}'.format(instance.vrf.pk if instance.vrf else '0', instance.prefix)
 
+        # Compile permissions list for rendering the object table
+        permissions = {
+            'add': request.user.has_perm('ipam.add_iprange'),
+            'change': request.user.has_perm('ipam.change_iprange'),
+            'delete': request.user.has_perm('ipam.delete_iprange'),
+        }
+
         return {
             'table': table,
+            'permissions': permissions,
             'bulk_querystring': bulk_querystring,
             'active_tab': 'ip-ranges',
         }

+ 1 - 1
netbox/templates/ipam/prefix/ip_ranges.html

@@ -6,7 +6,7 @@
   <div class="row">
     <div class="col col-md-12">
       {% include 'inc/table_controls.html' with table_modal="IPRangeTable_config" %}
-      {% include 'utilities/obj_table.html' with heading='Child IP Ranges' bulk_edit_url='ipam:prefix_bulk_edit' bulk_delete_url='ipam:prefix_bulk_delete' parent=prefix %}
+      {% include 'utilities/obj_table.html' with heading='Child IP Ranges' bulk_edit_url='ipam:iprange_bulk_edit' bulk_delete_url='ipam:iprange_bulk_delete' parent=prefix %}
     </div>
   </div>
   {% table_config_form table table_name="IPRangeTable" %}