فهرست منبع

Rename device component edit URLs

Jeremy Stretch 6 سال پیش
والد
کامیت
c1792653cc
4فایلهای تغییر یافته به همراه3 افزوده شده و 4 حذف شده
  1. 1 1
      netbox/dcim/urls.py
  2. 0 1
      netbox/dcim/views.py
  3. 1 1
      netbox/templates/dcim/devicetype.html
  4. 1 1
      netbox/templates/dcim/inc/devicetype_component_table.html

+ 1 - 1
netbox/dcim/urls.py

@@ -112,7 +112,7 @@ urlpatterns = [
 
 
     # Interface templates
     # Interface templates
     path('device-types/<int:pk>/interfaces/add/', views.InterfaceTemplateCreateView.as_view(), name='devicetype_add_interface'),
     path('device-types/<int:pk>/interfaces/add/', views.InterfaceTemplateCreateView.as_view(), name='devicetype_add_interface'),
-    path('device-types/<int:pk>/interfaces/edit/', views.InterfaceTemplateBulkEditView.as_view(), name='devicetype_bulkedit_interface'),
+    path('interface-templates/edit/', views.InterfaceTemplateBulkEditView.as_view(), name='interfacetemplate_bulk_edit'),
     path('interface-templates/delete/', views.InterfaceTemplateBulkDeleteView.as_view(), name='interfacetemplate_bulk_delete'),
     path('interface-templates/delete/', views.InterfaceTemplateBulkDeleteView.as_view(), name='interfacetemplate_bulk_delete'),
     path('interface-templates/<int:pk>/edit/', views.InterfaceTemplateEditView.as_view(), name='interfacetemplate_edit'),
     path('interface-templates/<int:pk>/edit/', views.InterfaceTemplateEditView.as_view(), name='interfacetemplate_edit'),
 
 

+ 0 - 1
netbox/dcim/views.py

@@ -810,7 +810,6 @@ class InterfaceTemplateEditView(PermissionRequiredMixin, ObjectEditView):
 class InterfaceTemplateBulkEditView(PermissionRequiredMixin, BulkEditView):
 class InterfaceTemplateBulkEditView(PermissionRequiredMixin, BulkEditView):
     permission_required = 'dcim.change_interfacetemplate'
     permission_required = 'dcim.change_interfacetemplate'
     queryset = InterfaceTemplate.objects.all()
     queryset = InterfaceTemplate.objects.all()
-    parent_model = DeviceType
     table = tables.InterfaceTemplateTable
     table = tables.InterfaceTemplateTable
     form = forms.InterfaceTemplateBulkEditForm
     form = forms.InterfaceTemplateBulkEditForm
 
 

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

@@ -167,7 +167,7 @@
 {% if devicetype.interface_templates.exists %}
 {% if devicetype.interface_templates.exists %}
     <div class="row">
     <div class="row">
         <div class="col-md-12">
         <div class="col-md-12">
-            {% include 'dcim/inc/devicetype_component_table.html' with table=interface_table title='Interfaces' add_url='dcim:devicetype_add_interface' delete_url='dcim:interfacetemplate_bulk_delete' %}
+            {% include 'dcim/inc/devicetype_component_table.html' with table=interface_table title='Interfaces' add_url='dcim:devicetype_add_interface' edit_url='dcim:interfacetemplate_bulk_edit' delete_url='dcim:interfacetemplate_bulk_delete' %}
         </div>
         </div>
     </div>
     </div>
 {% endif %}
 {% endif %}

+ 1 - 1
netbox/templates/dcim/inc/devicetype_component_table.html

@@ -9,7 +9,7 @@
             <div class="panel-footer noprint">
             <div class="panel-footer noprint">
                 {% if table.rows %}
                 {% if table.rows %}
                     {% if edit_url %}
                     {% if edit_url %}
-                        <button type="submit" name="_edit" formaction="{% url edit_url pk=devicetype.pk %}?return_url={{ devicetype.get_absolute_url }}" class="btn btn-xs btn-warning">
+                        <button type="submit" name="_edit" formaction="{% url edit_url %}?return_url={{ devicetype.get_absolute_url }}" class="btn btn-xs btn-warning">
                             <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit Selected
                             <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit Selected
                         </button>
                         </button>
                     {% endif %}
                     {% endif %}