صفحهٔ اصلی گشت‌و‌گذار راهنما
ورود
LBP
/
netbox
mirrorاز https://github.com/netbox-community/netbox.git
2
0
انشعاب 0
پرونده‌ها مشکلات 0 ویکی
فهرست منبع

Rename ObjectEditView.model_form to form

jeremystretch 3 سال پیش
والد
ed0c19807a
کامیت
ba1e6e91b9
8فایلهای تغییر یافته به همراه86 افزوده شده و 90 حذف شده
مشاهده تقسیم شده نمایش آمار تفاوت ها
  1. 5 5
      netbox/circuits/views.py
  2. 39 39
      netbox/dcim/views.py
  3. 8 8
      netbox/extras/views.py
  4. 16 16
      netbox/ipam/views.py
  5. 4 8
      netbox/netbox/views/generic/object_views.py
  6. 6 6
      netbox/tenancy/views.py
  7. 5 5
      netbox/virtualization/views.py
  8. 3 3
      netbox/wireless/views.py

+ 5 - 5
netbox/circuits/views.py
مشاهده فایل 

@@ -42,7 +42,7 @@ class ProviderView(generic.ObjectView):
 
 
 class ProviderEditView(generic.ObjectEditView):
 
     queryset = Provider.objects.all()
 
-    model_form = forms.ProviderForm
 
+    form = forms.ProviderForm
 
 
 
 class ProviderDeleteView(generic.ObjectDeleteView):
 
@@ -103,7 +103,7 @@ class ProviderNetworkView(generic.ObjectView):
 
 
 class ProviderNetworkEditView(generic.ObjectEditView):
 
     queryset = ProviderNetwork.objects.all()
 
-    model_form = forms.ProviderNetworkForm
 
+    form = forms.ProviderNetworkForm
 
 
 
 class ProviderNetworkDeleteView(generic.ObjectDeleteView):
 
@@ -157,7 +157,7 @@ class CircuitTypeView(generic.ObjectView):
 
 
 class CircuitTypeEditView(generic.ObjectEditView):
 
     queryset = CircuitType.objects.all()
 
-    model_form = forms.CircuitTypeForm
 
+    form = forms.CircuitTypeForm
 
 
 
 class CircuitTypeDeleteView(generic.ObjectDeleteView):
 
@@ -205,7 +205,7 @@ class CircuitView(generic.ObjectView):
 
 
 class CircuitEditView(generic.ObjectEditView):
 
     queryset = Circuit.objects.all()
 
-    model_form = forms.CircuitForm
 
+    form = forms.CircuitForm
 
 
 
 class CircuitDeleteView(generic.ObjectDeleteView):
 
@@ -315,7 +315,7 @@ class CircuitSwapTerminations(generic.ObjectEditView):
 
 
 class CircuitTerminationEditView(generic.ObjectEditView):
 
     queryset = CircuitTermination.objects.all()
 
-    model_form = forms.CircuitTerminationForm
 
+    form = forms.CircuitTerminationForm
 
     template_name = 'circuits/circuittermination_edit.html'

+ 39 - 39
netbox/dcim/views.py
مشاهده فایل 

@@ -177,7 +177,7 @@ class RegionView(generic.ObjectView):
 
 
 class RegionEditView(generic.ObjectEditView):
 
     queryset = Region.objects.all()
 
-    model_form = forms.RegionForm
 
+    form = forms.RegionForm
 
 
 
 class RegionDeleteView(generic.ObjectDeleteView):
 
@@ -262,7 +262,7 @@ class SiteGroupView(generic.ObjectView):
 
 
 class SiteGroupEditView(generic.ObjectEditView):
 
     queryset = SiteGroup.objects.all()
 
-    model_form = forms.SiteGroupForm
 
+    form = forms.SiteGroupForm
 
 
 
 class SiteGroupDeleteView(generic.ObjectDeleteView):
 
@@ -359,7 +359,7 @@ class SiteView(generic.ObjectView):
 
 
 class SiteEditView(generic.ObjectEditView):
 
     queryset = Site.objects.all()
 
-    model_form = forms.SiteForm
 
+    form = forms.SiteForm
 
 
 
 class SiteDeleteView(generic.ObjectDeleteView):
 
@@ -447,7 +447,7 @@ class LocationView(generic.ObjectView):
 
 
 class LocationEditView(generic.ObjectEditView):
 
     queryset = Location.objects.all()
 
-    model_form = forms.LocationForm
 
+    form = forms.LocationForm
 
 
 
 class LocationDeleteView(generic.ObjectDeleteView):
 
@@ -516,7 +516,7 @@ class RackRoleView(generic.ObjectView):
 
 
 class RackRoleEditView(generic.ObjectEditView):
 
     queryset = RackRole.objects.all()
 
-    model_form = forms.RackRoleForm
 
+    form = forms.RackRoleForm
 
 
 
 class RackRoleDeleteView(generic.ObjectDeleteView):
 
@@ -641,7 +641,7 @@ class RackView(generic.ObjectView):
 
 
 class RackEditView(generic.ObjectEditView):
 
     queryset = Rack.objects.all()
 
-    model_form = forms.RackForm
 
+    form = forms.RackForm
 
     template_name = 'dcim/rack_edit.html'
 
 
 
@@ -685,7 +685,7 @@ class RackReservationView(generic.ObjectView):
 
 
 class RackReservationEditView(generic.ObjectEditView):
 
     queryset = RackReservation.objects.all()
 
-    model_form = forms.RackReservationForm
 
+    form = forms.RackReservationForm
 
 
     def alter_object(self, obj, request, args, kwargs):
 
         if not obj.pk:
 
@@ -771,7 +771,7 @@ class ManufacturerView(generic.ObjectView):
 
 
 class ManufacturerEditView(generic.ObjectEditView):
 
     queryset = Manufacturer.objects.all()
 
-    model_form = forms.ManufacturerForm
 
+    form = forms.ManufacturerForm
 
 
 
 class ManufacturerDeleteView(generic.ObjectDeleteView):
 
@@ -896,7 +896,7 @@ class DeviceTypeInventoryItemsView(DeviceTypeComponentsView):
 
 
 class DeviceTypeEditView(generic.ObjectEditView):
 
     queryset = DeviceType.objects.all()
 
-    model_form = forms.DeviceTypeForm
 
+    form = forms.DeviceTypeForm
 
 
 
 class DeviceTypeDeleteView(generic.ObjectDeleteView):
 
@@ -1029,7 +1029,7 @@ class ModuleTypeRearPortsView(ModuleTypeComponentsView):
 
 
 class ModuleTypeEditView(generic.ObjectEditView):
 
     queryset = ModuleType.objects.all()
 
-    model_form = forms.ModuleTypeForm
 
+    form = forms.ModuleTypeForm
 
 
 
 class ModuleTypeDeleteView(generic.ObjectDeleteView):
 
@@ -1094,7 +1094,7 @@ class ConsolePortTemplateCreateView(generic.ComponentCreateView):
 
 
 class ConsolePortTemplateEditView(generic.ObjectEditView):
 
     queryset = ConsolePortTemplate.objects.all()
 
-    model_form = forms.ConsolePortTemplateForm
 
+    form = forms.ConsolePortTemplateForm
 
 
 
 class ConsolePortTemplateDeleteView(generic.ObjectDeleteView):
 
@@ -1129,7 +1129,7 @@ class ConsoleServerPortTemplateCreateView(generic.ComponentCreateView):
 
 
 class ConsoleServerPortTemplateEditView(generic.ObjectEditView):
 
     queryset = ConsoleServerPortTemplate.objects.all()
 
-    model_form = forms.ConsoleServerPortTemplateForm
 
+    form = forms.ConsoleServerPortTemplateForm
 
 
 
 class ConsoleServerPortTemplateDeleteView(generic.ObjectDeleteView):
 
@@ -1164,7 +1164,7 @@ class PowerPortTemplateCreateView(generic.ComponentCreateView):
 
 
 class PowerPortTemplateEditView(generic.ObjectEditView):
 
     queryset = PowerPortTemplate.objects.all()
 
-    model_form = forms.PowerPortTemplateForm
 
+    form = forms.PowerPortTemplateForm
 
 
 
 class PowerPortTemplateDeleteView(generic.ObjectDeleteView):
 
@@ -1199,7 +1199,7 @@ class PowerOutletTemplateCreateView(generic.ComponentCreateView):
 
 
 class PowerOutletTemplateEditView(generic.ObjectEditView):
 
     queryset = PowerOutletTemplate.objects.all()
 
-    model_form = forms.PowerOutletTemplateForm
 
+    form = forms.PowerOutletTemplateForm
 
 
 
 class PowerOutletTemplateDeleteView(generic.ObjectDeleteView):
 
@@ -1234,7 +1234,7 @@ class InterfaceTemplateCreateView(generic.ComponentCreateView):
 
 
 class InterfaceTemplateEditView(generic.ObjectEditView):
 
     queryset = InterfaceTemplate.objects.all()
 
-    model_form = forms.InterfaceTemplateForm
 
+    form = forms.InterfaceTemplateForm
 
 
 
 class InterfaceTemplateDeleteView(generic.ObjectDeleteView):
 
@@ -1277,7 +1277,7 @@ class FrontPortTemplateCreateView(generic.ComponentCreateView):
 
 
 class FrontPortTemplateEditView(generic.ObjectEditView):
 
     queryset = FrontPortTemplate.objects.all()
 
-    model_form = forms.FrontPortTemplateForm
 
+    form = forms.FrontPortTemplateForm
 
 
 
 class FrontPortTemplateDeleteView(generic.ObjectDeleteView):
 
@@ -1312,7 +1312,7 @@ class RearPortTemplateCreateView(generic.ComponentCreateView):
 
 
 class RearPortTemplateEditView(generic.ObjectEditView):
 
     queryset = RearPortTemplate.objects.all()
 
-    model_form = forms.RearPortTemplateForm
 
+    form = forms.RearPortTemplateForm
 
 
 
 class RearPortTemplateDeleteView(generic.ObjectDeleteView):
 
@@ -1348,7 +1348,7 @@ class ModuleBayTemplateCreateView(generic.ComponentCreateView):
 
 
 class ModuleBayTemplateEditView(generic.ObjectEditView):
 
     queryset = ModuleBayTemplate.objects.all()
 
-    model_form = forms.ModuleBayTemplateForm
 
+    form = forms.ModuleBayTemplateForm
 
 
 
 class ModuleBayTemplateDeleteView(generic.ObjectDeleteView):
 
@@ -1383,7 +1383,7 @@ class DeviceBayTemplateCreateView(generic.ComponentCreateView):
 
 
 class DeviceBayTemplateEditView(generic.ObjectEditView):
 
     queryset = DeviceBayTemplate.objects.all()
 
-    model_form = forms.DeviceBayTemplateForm
 
+    form = forms.DeviceBayTemplateForm
 
 
 
 class DeviceBayTemplateDeleteView(generic.ObjectDeleteView):
 
@@ -1429,7 +1429,7 @@ class InventoryItemTemplateCreateView(generic.ComponentCreateView):
 
 
 class InventoryItemTemplateEditView(generic.ObjectEditView):
 
     queryset = InventoryItemTemplate.objects.all()
 
-    model_form = forms.InventoryItemTemplateForm
 
+    form = forms.InventoryItemTemplateForm
 
 
 
 class InventoryItemTemplateDeleteView(generic.ObjectDeleteView):
 
@@ -1484,7 +1484,7 @@ class DeviceRoleView(generic.ObjectView):
 
 
 class DeviceRoleEditView(generic.ObjectEditView):
 
     queryset = DeviceRole.objects.all()
 
-    model_form = forms.DeviceRoleForm
 
+    form = forms.DeviceRoleForm
 
 
 
 class DeviceRoleDeleteView(generic.ObjectDeleteView):
 
@@ -1547,7 +1547,7 @@ class PlatformView(generic.ObjectView):
 
 
 class PlatformEditView(generic.ObjectEditView):
 
     queryset = Platform.objects.all()
 
-    model_form = forms.PlatformForm
 
+    form = forms.PlatformForm
 
 
 
 class PlatformDeleteView(generic.ObjectDeleteView):
 
@@ -1730,7 +1730,7 @@ class DeviceConfigContextView(ObjectConfigContextView):
 
 
 class DeviceEditView(generic.ObjectEditView):
 
     queryset = Device.objects.all()
 
-    model_form = forms.DeviceForm
 
+    form = forms.DeviceForm
 
     template_name = 'dcim/device_edit.html'
 
 
 
@@ -1793,7 +1793,7 @@ class ModuleView(generic.ObjectView):
 
 
 class ModuleEditView(generic.ObjectEditView):
 
     queryset = Module.objects.all()
 
-    model_form = forms.ModuleForm
 
+    form = forms.ModuleForm
 
 
 
 class ModuleDeleteView(generic.ObjectDeleteView):
 
@@ -1843,7 +1843,7 @@ class ConsolePortCreateView(generic.ComponentCreateView):
 
 
 class ConsolePortEditView(generic.ObjectEditView):
 
     queryset = ConsolePort.objects.all()
 
-    model_form = forms.ConsolePortForm
 
+    form = forms.ConsolePortForm
 
     template_name = 'dcim/device_component_edit.html'
 
 
 
@@ -1902,7 +1902,7 @@ class ConsoleServerPortCreateView(generic.ComponentCreateView):
 
 
 class ConsoleServerPortEditView(generic.ObjectEditView):
 
     queryset = ConsoleServerPort.objects.all()
 
-    model_form = forms.ConsoleServerPortForm
 
+    form = forms.ConsoleServerPortForm
 
     template_name = 'dcim/device_component_edit.html'
 
 
 
@@ -1961,7 +1961,7 @@ class PowerPortCreateView(generic.ComponentCreateView):
 
 
 class PowerPortEditView(generic.ObjectEditView):
 
     queryset = PowerPort.objects.all()
 
-    model_form = forms.PowerPortForm
 
+    form = forms.PowerPortForm
 
     template_name = 'dcim/device_component_edit.html'
 
 
 
@@ -2020,7 +2020,7 @@ class PowerOutletCreateView(generic.ComponentCreateView):
 
 
 class PowerOutletEditView(generic.ObjectEditView):
 
     queryset = PowerOutlet.objects.all()
 
-    model_form = forms.PowerOutletForm
 
+    form = forms.PowerOutletForm
 
     template_name = 'dcim/device_component_edit.html'
 
 
 
@@ -2142,7 +2142,7 @@ class InterfaceCreateView(generic.ComponentCreateView):
 
 
 class InterfaceEditView(generic.ObjectEditView):
 
     queryset = Interface.objects.all()
 
-    model_form = forms.InterfaceForm
 
+    form = forms.InterfaceForm
 
     template_name = 'dcim/interface_edit.html'
 
 
 
@@ -2209,7 +2209,7 @@ class FrontPortCreateView(generic.ComponentCreateView):
 
 
 class FrontPortEditView(generic.ObjectEditView):
 
     queryset = FrontPort.objects.all()
 
-    model_form = forms.FrontPortForm
 
+    form = forms.FrontPortForm
 
     template_name = 'dcim/device_component_edit.html'
 
 
 
@@ -2268,7 +2268,7 @@ class RearPortCreateView(generic.ComponentCreateView):
 
 
 class RearPortEditView(generic.ObjectEditView):
 
     queryset = RearPort.objects.all()
 
-    model_form = forms.RearPortForm
 
+    form = forms.RearPortForm
 
     template_name = 'dcim/device_component_edit.html'
 
 
 
@@ -2328,7 +2328,7 @@ class ModuleBayCreateView(generic.ComponentCreateView):
 
 
 class ModuleBayEditView(generic.ObjectEditView):
 
     queryset = ModuleBay.objects.all()
 
-    model_form = forms.ModuleBayForm
 
+    form = forms.ModuleBayForm
 
     template_name = 'dcim/device_component_edit.html'
 
 
 
@@ -2383,7 +2383,7 @@ class DeviceBayCreateView(generic.ComponentCreateView):
 
 
 class DeviceBayEditView(generic.ObjectEditView):
 
     queryset = DeviceBay.objects.all()
 
-    model_form = forms.DeviceBayForm
 
+    form = forms.DeviceBayForm
 
     template_name = 'dcim/device_component_edit.html'
 
 
 
@@ -2499,7 +2499,7 @@ class InventoryItemView(generic.ObjectView):
 
 
 class InventoryItemEditView(generic.ObjectEditView):
 
     queryset = InventoryItem.objects.all()
 
-    model_form = forms.InventoryItemForm
 
+    form = forms.InventoryItemForm
 
 
 
 class InventoryItemCreateView(generic.ComponentCreateView):
 
@@ -2571,7 +2571,7 @@ class InventoryItemRoleView(generic.ObjectView):
 
 
 class InventoryItemRoleEditView(generic.ObjectEditView):
 
     queryset = InventoryItemRole.objects.all()
 
-    model_form = forms.InventoryItemRoleForm
 
+    form = forms.InventoryItemRoleForm
 
 
 
 class InventoryItemRoleDeleteView(generic.ObjectDeleteView):
 
@@ -2853,7 +2853,7 @@ class CableCreateView(generic.ObjectEditView):
 
 
 class CableEditView(generic.ObjectEditView):
 
     queryset = Cable.objects.all()
 
-    model_form = forms.CableForm
 
+    form = forms.CableForm
 
     template_name = 'dcim/cable_edit.html'
 
 
 
@@ -2952,7 +2952,7 @@ class VirtualChassisView(generic.ObjectView):
 
 
 class VirtualChassisCreateView(generic.ObjectEditView):
 
     queryset = VirtualChassis.objects.all()
 
-    model_form = forms.VirtualChassisCreateForm
 
+    form = forms.VirtualChassisCreateForm
 
     template_name = 'dcim/virtualchassis_add.html'
 
 
 
@@ -3189,7 +3189,7 @@ class PowerPanelView(generic.ObjectView):
 
 
 class PowerPanelEditView(generic.ObjectEditView):
 
     queryset = PowerPanel.objects.all()
 
-    model_form = forms.PowerPanelForm
 
+    form = forms.PowerPanelForm
 
 
 
 class PowerPanelDeleteView(generic.ObjectDeleteView):
 
@@ -3236,7 +3236,7 @@ class PowerFeedView(generic.ObjectView):
 
 
 class PowerFeedEditView(generic.ObjectEditView):
 
     queryset = PowerFeed.objects.all()
 
-    model_form = forms.PowerFeedForm
 
+    form = forms.PowerFeedForm
 
 
 
 class PowerFeedDeleteView(generic.ObjectDeleteView):

+ 8 - 8
netbox/extras/views.py
مشاهده فایل 

@@ -37,7 +37,7 @@ class CustomFieldView(generic.ObjectView):
 
 
 class CustomFieldEditView(generic.ObjectEditView):
 
     queryset = CustomField.objects.all()
 
-    model_form = forms.CustomFieldForm
 
+    form = forms.CustomFieldForm
 
 
 
 class CustomFieldDeleteView(generic.ObjectDeleteView):
 
@@ -80,7 +80,7 @@ class CustomLinkView(generic.ObjectView):
 
 
 class CustomLinkEditView(generic.ObjectEditView):
 
     queryset = CustomLink.objects.all()
 
-    model_form = forms.CustomLinkForm
 
+    form = forms.CustomLinkForm
 
 
 
 class CustomLinkDeleteView(generic.ObjectDeleteView):
 
@@ -123,7 +123,7 @@ class ExportTemplateView(generic.ObjectView):
 
 
 class ExportTemplateEditView(generic.ObjectEditView):
 
     queryset = ExportTemplate.objects.all()
 
-    model_form = forms.ExportTemplateForm
 
+    form = forms.ExportTemplateForm
 
 
 
 class ExportTemplateDeleteView(generic.ObjectDeleteView):
 
@@ -166,7 +166,7 @@ class WebhookView(generic.ObjectView):
 
 
 class WebhookEditView(generic.ObjectEditView):
 
     queryset = Webhook.objects.all()
 
-    model_form = forms.WebhookForm
 
+    form = forms.WebhookForm
 
 
 
 class WebhookDeleteView(generic.ObjectDeleteView):
 
@@ -232,7 +232,7 @@ class TagView(generic.ObjectView):
 
 
 class TagEditView(generic.ObjectEditView):
 
     queryset = Tag.objects.all()
 
-    model_form = forms.TagForm
 
+    form = forms.TagForm
 
 
 
 class TagDeleteView(generic.ObjectDeleteView):
 
@@ -310,7 +310,7 @@ class ConfigContextView(generic.ObjectView):
 
 
 class ConfigContextEditView(generic.ObjectEditView):
 
     queryset = ConfigContext.objects.all()
 
-    model_form = forms.ConfigContextForm
 
+    form = forms.ConfigContextForm
 
     template_name = 'extras/configcontext_edit.html'
 
 
 
@@ -428,7 +428,7 @@ class ObjectChangeView(generic.ObjectView):
 
 
 class ImageAttachmentEditView(generic.ObjectEditView):
 
     queryset = ImageAttachment.objects.all()
 
-    model_form = forms.ImageAttachmentForm
 
+    form = forms.ImageAttachmentForm
 
     template_name = 'extras/imageattachment_edit.html'
 
 
     def alter_object(self, instance, request, args, kwargs):
 
@@ -467,7 +467,7 @@ class JournalEntryView(generic.ObjectView):
 
 
 class JournalEntryEditView(generic.ObjectEditView):
 
     queryset = JournalEntry.objects.all()
 
-    model_form = forms.JournalEntryForm
 
+    form = forms.JournalEntryForm
 
 
     def alter_object(self, obj, request, args, kwargs):
 
         if not obj.pk:

+ 16 - 16
netbox/ipam/views.py
مشاهده فایل 

@@ -55,7 +55,7 @@ class VRFView(generic.ObjectView):
 
 
 class VRFEditView(generic.ObjectEditView):
 
     queryset = VRF.objects.all()
 
-    model_form = forms.VRFForm
 
+    form = forms.VRFForm
 
 
 
 class VRFDeleteView(generic.ObjectDeleteView):
 
@@ -113,7 +113,7 @@ class RouteTargetView(generic.ObjectView):
 
 
 class RouteTargetEditView(generic.ObjectEditView):
 
     queryset = RouteTarget.objects.all()
 
-    model_form = forms.RouteTargetForm
 
+    form = forms.RouteTargetForm
 
 
 
 class RouteTargetDeleteView(generic.ObjectDeleteView):
 
@@ -169,7 +169,7 @@ class RIRView(generic.ObjectView):
 
 
 class RIREditView(generic.ObjectEditView):
 
     queryset = RIR.objects.all()
 
-    model_form = forms.RIRForm
 
+    form = forms.RIRForm
 
 
 
 class RIRDeleteView(generic.ObjectDeleteView):
 
@@ -228,7 +228,7 @@ class ASNView(generic.ObjectView):
 
 
 class ASNEditView(generic.ObjectEditView):
 
     queryset = ASN.objects.all()
 
-    model_form = forms.ASNForm
 
+    form = forms.ASNForm
 
 
 
 class ASNDeleteView(generic.ObjectDeleteView):
 
@@ -306,7 +306,7 @@ class AggregatePrefixesView(generic.ObjectChildrenView):
 
 
 class AggregateEditView(generic.ObjectEditView):
 
     queryset = Aggregate.objects.all()
 
-    model_form = forms.AggregateForm
 
+    form = forms.AggregateForm
 
 
 
 class AggregateDeleteView(generic.ObjectDeleteView):
 
@@ -365,7 +365,7 @@ class RoleView(generic.ObjectView):
 
 
 class RoleEditView(generic.ObjectEditView):
 
     queryset = Role.objects.all()
 
-    model_form = forms.RoleForm
 
+    form = forms.RoleForm
 
 
 
 class RoleDeleteView(generic.ObjectDeleteView):
 
@@ -524,7 +524,7 @@ class PrefixIPAddressesView(generic.ObjectChildrenView):
 
 
 class PrefixEditView(generic.ObjectEditView):
 
     queryset = Prefix.objects.all()
 
-    model_form = forms.PrefixForm
 
+    form = forms.PrefixForm
 
 
 
 class PrefixDeleteView(generic.ObjectDeleteView):
 
@@ -585,7 +585,7 @@ class IPRangeIPAddressesView(generic.ObjectChildrenView):
 
 
 class IPRangeEditView(generic.ObjectEditView):
 
     queryset = IPRange.objects.all()
 
-    model_form = forms.IPRangeForm
 
+    form = forms.IPRangeForm
 
 
 
 class IPRangeDeleteView(generic.ObjectDeleteView):
 
@@ -673,7 +673,7 @@ class IPAddressView(generic.ObjectView):
 
 
 class IPAddressEditView(generic.ObjectEditView):
 
     queryset = IPAddress.objects.all()
 
-    model_form = forms.IPAddressForm
 
+    form = forms.IPAddressForm
 
     template_name = 'ipam/ipaddress_edit.html'
 
 
     def alter_object(self, obj, request, url_args, url_kwargs):
 
@@ -815,7 +815,7 @@ class VLANGroupView(generic.ObjectView):
 
 
 class VLANGroupEditView(generic.ObjectEditView):
 
     queryset = VLANGroup.objects.all()
 
-    model_form = forms.VLANGroupForm
 
+    form = forms.VLANGroupForm
 
 
 
 class VLANGroupDeleteView(generic.ObjectDeleteView):
 
@@ -884,7 +884,7 @@ class FHRPGroupView(generic.ObjectView):
 
 
 class FHRPGroupEditView(generic.ObjectEditView):
 
     queryset = FHRPGroup.objects.all()
 
-    model_form = forms.FHRPGroupForm
 
+    form = forms.FHRPGroupForm
 
     template_name = 'ipam/fhrpgroup_edit.html'
 
 
     def get_return_url(self, request, obj=None):
 
@@ -927,7 +927,7 @@ class FHRPGroupBulkDeleteView(generic.BulkDeleteView):
 
 
 class FHRPGroupAssignmentEditView(generic.ObjectEditView):
 
     queryset = FHRPGroupAssignment.objects.all()
 
-    model_form = forms.FHRPGroupAssignmentForm
 
+    form = forms.FHRPGroupAssignmentForm
 
     template_name = 'ipam/fhrpgroupassignment_edit.html'
 
 
     def alter_object(self, instance, request, args, kwargs):
 
@@ -1001,7 +1001,7 @@ class VLANVMInterfacesView(generic.ObjectChildrenView):
 
 
 class VLANEditView(generic.ObjectEditView):
 
     queryset = VLAN.objects.all()
 
-    model_form = forms.VLANForm
 
+    form = forms.VLANForm
 
     template_name = 'ipam/vlan_edit.html'
 
 
 
@@ -1045,7 +1045,7 @@ class ServiceTemplateView(generic.ObjectView):
 
 
 class ServiceTemplateEditView(generic.ObjectEditView):
 
     queryset = ServiceTemplate.objects.all()
 
-    model_form = forms.ServiceTemplateForm
 
+    form = forms.ServiceTemplateForm
 
 
 
 class ServiceTemplateDeleteView(generic.ObjectDeleteView):
 
@@ -1088,13 +1088,13 @@ class ServiceView(generic.ObjectView):
 
 
 class ServiceCreateView(generic.ObjectEditView):
 
     queryset = Service.objects.all()
 
-    model_form = forms.ServiceCreateForm
 
+    form = forms.ServiceCreateForm
 
     template_name = 'ipam/service_create.html'
 
 
 
 class ServiceEditView(generic.ObjectEditView):
 
     queryset = Service.objects.prefetch_related('ipaddresses')
 
-    model_form = forms.ServiceForm
 
+    form = forms.ServiceForm
 
     template_name = 'ipam/service_edit.html'

+ 4 - 8
netbox/netbox/views/generic/object_views.py
مشاهده فایل 

@@ -286,10 +286,10 @@ class ObjectEditView(GetReturnURLMixin, BaseObjectView):
 
     Create or edit a single object.
 
 
     Attributes:
 
-        model_form: The form used to create or edit the object
 
+        form: The form used to create or edit the object
 
     """
 
     template_name = 'generic/object_edit.html'
 
-    model_form = None
 
+    form = None
 
 
     def dispatch(self, request, *args, **kwargs):
 
         # Determine required permission based on whether we are editing an existing object
 
@@ -339,7 +339,7 @@ class ObjectEditView(GetReturnURLMixin, BaseObjectView):
 
         obj = self.alter_object(obj, request, args, kwargs)
 
 
         initial_data = normalize_querydict(request.GET)
 
-        form = self.model_form(instance=obj, initial=initial_data)
 
+        form = self.form(instance=obj, initial=initial_data)
 
         restrict_form_fields(form, request.user)
 
 
         return render(request, self.template_name, {
 
@@ -365,11 +365,7 @@ class ObjectEditView(GetReturnURLMixin, BaseObjectView):
 
 
         obj = self.alter_object(obj, request, args, kwargs)
 
 
-        form = self.model_form(
 
-            data=request.POST,
 
-            files=request.FILES,
 
-            instance=obj
 
-        )
 
+        form = self.form(data=request.POST, files=request.FILES, instance=obj)
 
         restrict_form_fields(form, request.user)
 
 
         if form.is_valid():

+ 6 - 6
netbox/tenancy/views.py
مشاهده فایل 

@@ -45,7 +45,7 @@ class TenantGroupView(generic.ObjectView):
 
 
 class TenantGroupEditView(generic.ObjectEditView):
 
     queryset = TenantGroup.objects.all()
 
-    model_form = forms.TenantGroupForm
 
+    form = forms.TenantGroupForm
 
 
 
 class TenantGroupDeleteView(generic.ObjectDeleteView):
 
@@ -122,7 +122,7 @@ class TenantView(generic.ObjectView):
 
 
 class TenantEditView(generic.ObjectEditView):
 
     queryset = Tenant.objects.all()
 
-    model_form = forms.TenantForm
 
+    form = forms.TenantForm
 
 
 
 class TenantDeleteView(generic.ObjectDeleteView):
 
@@ -195,7 +195,7 @@ class ContactGroupView(generic.ObjectView):
 
 
 class ContactGroupEditView(generic.ObjectEditView):
 
     queryset = ContactGroup.objects.all()
 
-    model_form = forms.ContactGroupForm
 
+    form = forms.ContactGroupForm
 
 
 
 class ContactGroupDeleteView(generic.ObjectDeleteView):
 
@@ -262,7 +262,7 @@ class ContactRoleView(generic.ObjectView):
 
 
 class ContactRoleEditView(generic.ObjectEditView):
 
     queryset = ContactRole.objects.all()
 
-    model_form = forms.ContactRoleForm
 
+    form = forms.ContactRoleForm
 
 
 
 class ContactRoleDeleteView(generic.ObjectDeleteView):
 
@@ -319,7 +319,7 @@ class ContactView(generic.ObjectView):
 
 
 class ContactEditView(generic.ObjectEditView):
 
     queryset = Contact.objects.all()
 
-    model_form = forms.ContactForm
 
+    form = forms.ContactForm
 
 
 
 class ContactDeleteView(generic.ObjectDeleteView):
 
@@ -351,7 +351,7 @@ class ContactBulkDeleteView(generic.BulkDeleteView):
 
 
 class ContactAssignmentEditView(generic.ObjectEditView):
 
     queryset = ContactAssignment.objects.all()
 
-    model_form = forms.ContactAssignmentForm
 
+    form = forms.ContactAssignmentForm
 
     template_name = 'tenancy/contactassignment_edit.html'
 
 
     def alter_object(self, instance, request, args, kwargs):

+ 5 - 5
netbox/virtualization/views.py
مشاهده فایل 

@@ -49,7 +49,7 @@ class ClusterTypeView(generic.ObjectView):
 
 
 class ClusterTypeEditView(generic.ObjectEditView):
 
     queryset = ClusterType.objects.all()
 
-    model_form = forms.ClusterTypeForm
 
+    form = forms.ClusterTypeForm
 
 
 
 class ClusterTypeDeleteView(generic.ObjectDeleteView):
 
@@ -111,7 +111,7 @@ class ClusterGroupView(generic.ObjectView):
 
 
 class ClusterGroupEditView(generic.ObjectEditView):
 
     queryset = ClusterGroup.objects.all()
 
-    model_form = forms.ClusterGroupForm
 
+    form = forms.ClusterGroupForm
 
 
 
 class ClusterGroupDeleteView(generic.ObjectDeleteView):
 
@@ -195,7 +195,7 @@ class ClusterDevicesView(generic.ObjectChildrenView):
 
 
 class ClusterEditView(generic.ObjectEditView):
 
     queryset = Cluster.objects.all()
 
-    model_form = forms.ClusterForm
 
+    form = forms.ClusterForm
 
 
 
 class ClusterDeleteView(generic.ObjectDeleteView):
 
@@ -369,7 +369,7 @@ class VirtualMachineConfigContextView(ObjectConfigContextView):
 
 
 class VirtualMachineEditView(generic.ObjectEditView):
 
     queryset = VirtualMachine.objects.all()
 
-    model_form = forms.VirtualMachineForm
 
+    form = forms.VirtualMachineForm
 
 
 
 class VirtualMachineDeleteView(generic.ObjectDeleteView):
 
@@ -455,7 +455,7 @@ class VMInterfaceCreateView(generic.ComponentCreateView):
 
 
 class VMInterfaceEditView(generic.ObjectEditView):
 
     queryset = VMInterface.objects.all()
 
-    model_form = forms.VMInterfaceForm
 
+    form = forms.VMInterfaceForm
 
     template_name = 'virtualization/vminterface_edit.html'

+ 3 - 3
netbox/wireless/views.py
مشاهده فایل 

@@ -39,7 +39,7 @@ class WirelessLANGroupView(generic.ObjectView):
 
 
 class WirelessLANGroupEditView(generic.ObjectEditView):
 
     queryset = WirelessLANGroup.objects.all()
 
-    model_form = forms.WirelessLANGroupForm
 
+    form = forms.WirelessLANGroupForm
 
 
 
 class WirelessLANGroupDeleteView(generic.ObjectDeleteView):
 
@@ -107,7 +107,7 @@ class WirelessLANView(generic.ObjectView):
 
 
 class WirelessLANEditView(generic.ObjectEditView):
 
     queryset = WirelessLAN.objects.all()
 
-    model_form = forms.WirelessLANForm
 
+    form = forms.WirelessLANForm
 
 
 
 class WirelessLANDeleteView(generic.ObjectDeleteView):
 
@@ -150,7 +150,7 @@ class WirelessLinkView(generic.ObjectView):
 
 
 class WirelessLinkEditView(generic.ObjectEditView):
 
     queryset = WirelessLink.objects.all()
 
-    model_form = forms.WirelessLinkForm
 
+    form = forms.WirelessLinkForm
 
 
 
 class WirelessLinkDeleteView(generic.ObjectDeleteView):