diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f9434e32c..046f6cd79 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,39 +1,52 @@ -# Contributing to NetBox +## Getting Help -Thank you for your interest in contributing to NetBox! This document contains some quick pointers on reporting bugs and -requesting new features. +If you encounter any issues installing or using NetBox, try one of the following resources to get assistance. Please +**do not** open an issue on GitHub except to report bugs or request features. -## Reporting Issues +### Freenode IRC -* First, ensure that you've installed the latest stable version of NetBox. If you're running an older version, it's -possible that the bug has already been fixed. +Join the #netbox channel on [Freenode IRC](https://freenode.net/). You can connect to Freenode at irc.freenode.net using +an IRC client, or you can use their [webchat client](https://webchat.freenode.net/). -* Check the [issues list](https://github.com/digitalocean/netbox/issues) to see if the bug you've found has already been -reported. If you think you may be experiencing a reported issue, please add a quick comment to it with a "+1" and a -quick description of how it's affecting your installation. +### Reddit -* If you're having trouble installing NetBox, please join #netbox on irc.freenode.net and ask for help before creating -an issue on GitHub. Many installation problems are simple fixes. The issues list should be reserved for bug reports and -feature requests. +We have established [/r/netbox](https://www.reddit.com/r/netbox) on Reddit for NetBox issues and general discussion. +Reddit registration is free and does not require providing an email address (although it is encouraged). -* When submitting an issue, please be as descriptive as possible. Be sure to describe: +## Reporting Bugs + +* First, ensure that you've installed the [latest stable version](https://github.com/digitalocean/netbox/releases) of +NetBox. If you're running an older version, it's possible that the bug has already been fixed. + +* Next, check the GitHub [issues list](https://github.com/digitalocean/netbox/issues) to see if the bug you've found has +already been reported. If you think you may be experiencing a reported issue that hasn't already been resolved, please +click "add a reaction" in the top right corner of the issue and add a thumbs up (+1). You might also want to add a +comment describing how it's affecting your installation. This will allow us to prioritize bugs based on how many users +are affected. + +* If you haven't found an existing issue that describes your suspected bug, please inquire about it on IRC or Reddit. +**Do not** file an issue until you have received confirmation that it is in fact a bug. Invalid issues are very +distracting and slow the pace at which NetBox is developed. + +* When submitting an issue, please be as descriptive as possible. Be sure to include: * The environment in which NetBox is running * The exact steps that can be taken to reproduce the issue (if applicable) * Any error messages returned + * Screenshots (if applicable) * Keep in mind that we prioritize bugs based on their severity and how much work is required to resolve them. It may -take some time for someone to address your issue. If it's been longer than a week with no updates, please ping us on -IRC. +take some time for someone to address your issue. ## Feature Requests -* First, check the [issues list](https://github.com/digitalocean/netbox/issues) to see if the feature you're requesting -has already been requested (and possibly rejected). If it has, click "add a reaction" in the top right corner of the -issue and add a thumbs up (+1). This ensures that the issue has a better chance of making it onto the roadmap. Also feel -free to add a comment with any additional justification for the feature. +* First, check the GitHub [issues list](https://github.com/digitalocean/netbox/issues) to see if the feature you're +requesting is already listed. (Be sure to search closed issues as well, since some feature requests are rejected.) If +the feature you'd like to see has already been requested, click "add a reaction" in the top right corner of the issue +and add a thumbs up (+1). This ensures that the issue has a better chance of making it onto the roadmap. Also feel free +to add a comment with any additional justification for the feature. -* While discussion of new features is welcome, it's important to limit the scope of NetBox's feature set to avoid +* While suggestions for new features are welcome, it's important to limit the scope of NetBox's feature set to avoid feature creep. For example, the following features would be firmly out of scope for NetBox: * Ticket management @@ -41,17 +54,18 @@ feature creep. For example, the following features would be firmly out of scope * Acting as a DNS server * Acting as an authentication server -* Feature requests must be very narrowly defined. The more effort you put into writing a feature request, the better its -chances are of being implemented. Overly broad feature requests will be closed. +* Before filing a new feature request, propose it on IRC or Reddit first. Feedback you receive there will help validate +and shape the proposed feature before filing a formal issue. -* If you're not sure whether the feature you want is a good fit for NetBox, please ask in #netbox on irc.freenode.net. -Even if it's not quite right for NetBox, we may be able to point you to a tool better suited for the job. +* Good feature requests are very narrowly defined. Be sure to enumerate specific functionality and data schema. The more +effort you put into writing a feature request, the better its chances are of being implemented. Overly broad feature +requests will be closed. -* When submitting a feature request, be sure to include the following: +* When submitting a feature request on GitHub, be sure to include the following: - * A detailed description of the functionality + * A detailed description of the proposed functionality * A use case for the feature; who would use it and what value it would add to NetBox - * A rough description of any changes necessary to the database schema (if applicable) + * A rough description of any changes necessary to the database schema * Any third-party libraries or other resources which would be involved ## Submitting Pull Requests @@ -60,9 +74,8 @@ Even if it's not quite right for NetBox, we may be able to point you to a tool b before beginning work​. This will help prevent wasting time on something that might we might not be able to implement. When suggesting a new feature, also make sure it won't conflict with any work that's already in progress. -* When submitting a pull request, please be sure to work off of branch `develop`, rather than branch `master`. -In NetBox, the `develop` branch is used for ongoing development, while `master` is used for tagging new -stable releases. +* When submitting a pull request, please be sure to work off of the `develop` branch, rather than `master`. In NetBox, +the `develop` branch is used for ongoing development, while `master` is used for tagging new stable releases. * All code submissions should meet the following criteria (CI will enforce these checks): diff --git a/README.md b/README.md index 419f27b02..2cf8f0193 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,6 @@ Questions? Comments? Please join us on IRC in **#netbox** on **irc.freenode.net* # Installation -Please see docs/getting-started.md for instructions on installing NetBox. +Please see [the documentation](http://netbox.readthedocs.io/en/latest/) for instructions on installing NetBox. To upgrade NetBox, please download the [latest release](https://github.com/digitalocean/netbox/releases) and run `upgrade.sh`. diff --git a/docs/configuration/mandatory-settings.md b/docs/configuration/mandatory-settings.md index 07a6d8ede..8d96cf3a7 100644 --- a/docs/configuration/mandatory-settings.md +++ b/docs/configuration/mandatory-settings.md @@ -2,7 +2,7 @@ NetBox's local configuration is held in `netbox/netbox/configuration.py`. An exa ## ALLOWED_HOSTS -This is a list of valid fully-qualified domain names (FQDNs) for the NetBox server. NetBox will not permit write access to the server via any other hostnames. The first FQDN in the list will be treated as the preferred name. +This is a list of valid fully-qualified domain names (FQDNs) that is used to reach the NetBox service. Usually this is the same as the hostname for the NetBox server, but can also be different (e.g. when using a reverse proxy serving the NetBox website under a different FQDN than the hostname of the NetBox server). NetBox will not permit access to the server via any other hostnames (or IPs). The value of this option is also used to set `CSRF_TRUSTED_ORIGINS`, which restricts `HTTP POST` to the same set of hosts (more about this [here](https://docs.djangoproject.com/en/1.9/ref/settings/#std:setting-CSRF_TRUSTED_ORIGINS)). Keep in mind that NetBox, by default, has `USE_X_FORWARDED_HOST = True` (in `netbox/netbox/settings.py`) which means that if you're using a reverse proxy, it's the FQDN used to reach that reverse proxy which needs to be in this list (more about this [here](https://docs.djangoproject.com/en/1.9/ref/settings/#allowed-hosts)). Example: diff --git a/docs/index.md b/docs/index.md index e9f57253d..a661b5e0e 100644 --- a/docs/index.md +++ b/docs/index.md @@ -50,4 +50,4 @@ NetBox is built on the [Django](https://djangoproject.com/) Python framework and # Getting Started -See the [getting started](getting-started.md) guide for help with getting NetBox up and running quickly. +See the [installation guide](installation/postgresql.md) for help getting NetBox up and running quickly. diff --git a/netbox/circuits/forms.py b/netbox/circuits/forms.py index bfceb287a..263225aae 100644 --- a/netbox/circuits/forms.py +++ b/netbox/circuits/forms.py @@ -3,8 +3,7 @@ from django.db.models import Count from dcim.models import Site, Device, Interface, Rack, IFACE_FF_VIRTUAL from utilities.forms import ( - APISelect, BootstrapMixin, BulkImportForm, CommentField, ConfirmationForm, CSVDataField, Livesearch, SmallTextarea, - SlugField, + APISelect, BootstrapMixin, BulkImportForm, CommentField, CSVDataField, Livesearch, SmallTextarea, SlugField, ) from .models import Circuit, CircuitType, Provider @@ -55,10 +54,6 @@ class ProviderBulkEditForm(forms.Form, BootstrapMixin): comments = CommentField() -class ProviderBulkDeleteForm(ConfirmationForm): - pk = forms.ModelMultipleChoiceField(queryset=Provider.objects.all(), widget=forms.MultipleHiddenInput) - - def provider_site_choices(): site_choices = Site.objects.all() return [(s.slug, s.name) for s in site_choices] @@ -81,10 +76,6 @@ class CircuitTypeForm(forms.ModelForm, BootstrapMixin): fields = ['name', 'slug'] -class CircuitTypeBulkDeleteForm(ConfirmationForm): - pk = forms.ModelMultipleChoiceField(queryset=CircuitType.objects.all(), widget=forms.MultipleHiddenInput) - - # # Circuits # @@ -191,10 +182,6 @@ class CircuitBulkEditForm(forms.Form, BootstrapMixin): comments = CommentField() -class CircuitBulkDeleteForm(ConfirmationForm): - pk = forms.ModelMultipleChoiceField(queryset=Circuit.objects.all(), widget=forms.MultipleHiddenInput) - - def circuit_type_choices(): type_choices = CircuitType.objects.annotate(circuit_count=Count('circuits')) return [(t.slug, u'{} ({})'.format(t.name, t.circuit_count)) for t in type_choices] diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py index 790b8ba23..283146396 100644 --- a/netbox/circuits/views.py +++ b/netbox/circuits/views.py @@ -76,7 +76,6 @@ class ProviderBulkEditView(PermissionRequiredMixin, BulkEditView): class ProviderBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'circuits.delete_provider' cls = Provider - form = forms.ProviderBulkDeleteForm default_redirect_url = 'circuits:provider_list' @@ -102,7 +101,6 @@ class CircuitTypeEditView(PermissionRequiredMixin, ObjectEditView): class CircuitTypeBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'circuits.delete_circuittype' cls = CircuitType - form = forms.CircuitTypeBulkDeleteForm default_redirect_url = 'circuits:circuittype_list' @@ -171,5 +169,4 @@ class CircuitBulkEditView(PermissionRequiredMixin, BulkEditView): class CircuitBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'circuits.delete_circuit' cls = Circuit - form = forms.CircuitBulkDeleteForm default_redirect_url = 'circuits:circuit_list' diff --git a/netbox/dcim/admin.py b/netbox/dcim/admin.py index 09e16c348..c5210987b 100644 --- a/netbox/dcim/admin.py +++ b/netbox/dcim/admin.py @@ -78,8 +78,8 @@ class DeviceTypeAdmin(admin.ModelAdmin): InterfaceTemplateAdmin, DeviceBayTemplateAdmin, ] - list_display = ['model', 'manufacturer', 'slug', 'u_height', 'console_ports', 'console_server_ports', 'power_ports', - 'power_outlets', 'interfaces', 'device_bays'] + list_display = ['model', 'manufacturer', 'slug', 'part_number', 'u_height', 'console_ports', 'console_server_ports', + 'power_ports', 'power_outlets', 'interfaces', 'device_bays'] list_filter = ['manufacturer'] def get_queryset(self, request): diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index 5c7f655de..9224ce2b3 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -111,8 +111,8 @@ class DeviceTypeSerializer(serializers.ModelSerializer): class Meta: model = DeviceType - fields = ['id', 'manufacturer', 'model', 'slug', 'u_height', 'is_full_depth', 'is_console_server', 'is_pdu', - 'is_network_device'] + fields = ['id', 'manufacturer', 'model', 'slug', 'part_number', 'u_height', 'is_full_depth', + 'is_console_server', 'is_pdu', 'is_network_device'] class DeviceTypeNestedSerializer(DeviceTypeSerializer): @@ -164,9 +164,9 @@ class DeviceTypeDetailSerializer(DeviceTypeSerializer): interface_templates = InterfaceTemplateNestedSerializer(many=True, read_only=True) class Meta(DeviceTypeSerializer.Meta): - fields = ['id', 'manufacturer', 'model', 'slug', 'u_height', 'is_full_depth', 'is_console_server', 'is_pdu', - 'is_network_device', 'console_port_templates', 'cs_port_templates', 'power_port_templates', - 'power_outlet_templates', 'interface_templates'] + fields = ['id', 'manufacturer', 'model', 'slug', 'part_number', 'u_height', 'is_full_depth', + 'is_console_server', 'is_pdu', 'is_network_device', 'console_port_templates', 'cs_port_templates', + 'power_port_templates', 'power_outlet_templates', 'interface_templates'] # diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index 27b908d56..8eac377f2 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -419,53 +419,36 @@ class RelatedConnectionsView(APIView): return Response() else: - raise MissingFilterException(detail='Must specify search parameters (peer-device and peer-interface).') + raise MissingFilterException(detail='Must specify search parameters "peer-device" and "peer-interface".') # Initialize response skeleton - response = dict() - response['device'] = serializers.DeviceSerializer(device).data - response['console-ports'] = [] - response['power-ports'] = [] - response['interfaces'] = [] + response = { + 'device': serializers.DeviceSerializer(device).data, + 'console-ports': [], + 'power-ports': [], + 'interfaces': [], + } - # Build console connections + # Console connections console_ports = ConsolePort.objects.filter(device=device).select_related('cs_port__device') for cp in console_ports: - cp_info = dict() - cp_info['name'] = cp.name - if cp.cs_port: - cp_info['console-server'] = cp.cs_port.device.name - cp_info['port'] = cp.cs_port.name - else: - cp_info['console-server'] = None - cp_info['port'] = None - response['console-ports'].append(cp_info) + data = serializers.ConsolePortSerializer(instance=cp).data + del(data['device']) + response['console-ports'].append(data) - # Build power connections + # Power connections power_ports = PowerPort.objects.filter(device=device).select_related('power_outlet__device') for pp in power_ports: - pp_info = dict() - pp_info['name'] = pp.name - if pp.power_outlet: - pp_info['pdu'] = pp.power_outlet.device.name - pp_info['outlet'] = pp.power_outlet.name - else: - pp_info['pdu'] = None - pp_info['outlet'] = None - response['power-ports'].append(pp_info) + data = serializers.PowerPortSerializer(instance=pp).data + del(data['device']) + response['power-ports'].append(data) - # Built interface connections - interfaces = Interface.objects.filter(device=device) + # Interface connections + interfaces = Interface.objects.filter(device=device).select_related('connected_as_a', 'connected_as_b', + 'circuit') for iface in interfaces: - iface_info = dict() - iface_info['name'] = iface.name - peer_interface = iface.get_connected_interface() - if peer_interface: - iface_info['device'] = peer_interface.device.name - iface_info['interface'] = peer_interface.name - else: - iface_info['device'] = None - iface_info['interface'] = None - response['interfaces'].append(iface_info) + data = serializers.InterfaceDetailSerializer(instance=iface).data + del(data['device']) + response['interfaces'].append(data) return Response(response) diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index 8872e5747..0a4b14150 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -102,7 +102,7 @@ class DeviceTypeFilter(django_filters.FilterSet): class Meta: model = DeviceType - fields = ['manufacturer_id', 'manufacturer', 'model', 'u_height', 'is_console_server', 'is_pdu', + fields = ['manufacturer_id', 'manufacturer', 'model', 'part_number', 'u_height', 'is_console_server', 'is_pdu', 'is_network_device'] diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 43497b85c..7befaf78a 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -5,7 +5,7 @@ from django.db.models import Count, Q from ipam.models import IPAddress from utilities.forms import ( - APISelect, BootstrapMixin, BulkImportForm, CommentField, ConfirmationForm, CSVDataField, ExpandableNameField, + APISelect, BootstrapMixin, BulkImportForm, CommentField, CSVDataField, ExpandableNameField, FlexibleModelChoiceField, Livesearch, SelectWithDisabled, SmallTextarea, SlugField, ) @@ -85,10 +85,6 @@ class RackGroupForm(forms.ModelForm, BootstrapMixin): fields = ['site', 'name', 'slug'] -class RackGroupBulkDeleteForm(ConfirmationForm): - pk = forms.ModelMultipleChoiceField(queryset=RackGroup.objects.all(), widget=forms.MultipleHiddenInput) - - def rackgroup_site_choices(): site_choices = Site.objects.annotate(rack_count=Count('rack_groups')) return [(s.slug, u'{} ({})'.format(s.name, s.rack_count)) for s in site_choices] @@ -169,10 +165,6 @@ class RackBulkEditForm(forms.Form, BootstrapMixin): comments = CommentField() -class RackBulkDeleteForm(ConfirmationForm): - pk = forms.ModelMultipleChoiceField(queryset=Rack.objects.all(), widget=forms.MultipleHiddenInput) - - def rack_site_choices(): site_choices = Site.objects.annotate(rack_count=Count('racks')) return [(s.slug, u'{} ({})'.format(s.name, s.rack_count)) for s in site_choices] @@ -202,10 +194,6 @@ class ManufacturerForm(forms.ModelForm, BootstrapMixin): fields = ['name', 'slug'] -class ManufacturerBulkDeleteForm(ConfirmationForm): - pk = forms.ModelMultipleChoiceField(queryset=Manufacturer.objects.all(), widget=forms.MultipleHiddenInput) - - # # Device types # @@ -215,7 +203,7 @@ class DeviceTypeForm(forms.ModelForm, BootstrapMixin): class Meta: model = DeviceType - fields = ['manufacturer', 'model', 'slug', 'u_height', 'is_full_depth', 'is_console_server', 'is_pdu', + fields = ['manufacturer', 'model', 'slug', 'part_number', 'u_height', 'is_full_depth', 'is_console_server', 'is_pdu', 'is_network_device', 'subdevice_role'] @@ -225,10 +213,6 @@ class DeviceTypeBulkEditForm(forms.Form, BootstrapMixin): u_height = forms.IntegerField(min_value=1, required=False) -class DeviceTypeBulkDeleteForm(ConfirmationForm): - pk = forms.ModelMultipleChoiceField(queryset=DeviceType.objects.all(), widget=forms.MultipleHiddenInput) - - def devicetype_manufacturer_choices(): manufacturer_choices = Manufacturer.objects.annotate(devicetype_count=Count('device_types')) return [(m.slug, u'{} ({})'.format(m.name, m.devicetype_count)) for m in manufacturer_choices] @@ -303,10 +287,6 @@ class DeviceRoleForm(forms.ModelForm, BootstrapMixin): fields = ['name', 'slug', 'color'] -class DeviceRoleBulkDeleteForm(ConfirmationForm): - pk = forms.ModelMultipleChoiceField(queryset=DeviceRole.objects.all(), widget=forms.MultipleHiddenInput) - - # # Platforms # @@ -319,10 +299,6 @@ class PlatformForm(forms.ModelForm, BootstrapMixin): fields = ['name', 'slug'] -class PlatformBulkDeleteForm(ConfirmationForm): - pk = forms.ModelMultipleChoiceField(queryset=Platform.objects.all(), widget=forms.MultipleHiddenInput) - - # # Devices # @@ -542,10 +518,6 @@ class DeviceBulkEditForm(forms.Form, BootstrapMixin): serial = forms.CharField(max_length=50, required=False, label='Serial Number') -class DeviceBulkDeleteForm(ConfirmationForm): - pk = forms.ModelMultipleChoiceField(queryset=Device.objects.all(), widget=forms.MultipleHiddenInput) - - def device_site_choices(): site_choices = Site.objects.annotate(device_count=Count('racks__devices')) return [(s.slug, u'{} ({})'.format(s.name, s.device_count)) for s in site_choices] diff --git a/netbox/dcim/migrations/0011_devicetype_part_number.py b/netbox/dcim/migrations/0011_devicetype_part_number.py new file mode 100644 index 000000000..62c97abc6 --- /dev/null +++ b/netbox/dcim/migrations/0011_devicetype_part_number.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.8 on 2016-07-26 15:05 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('dcim', '0010_devicebay_installed_device_set_null'), + ] + + operations = [ + migrations.AddField( + model_name='devicetype', + name='part_number', + field=models.CharField(blank=True, help_text=b'Discrete part number (optional)', max_length=50), + ), + ] diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 22ffcdf5b..fc77e318b 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -409,6 +409,7 @@ class DeviceType(models.Model): manufacturer = models.ForeignKey('Manufacturer', related_name='device_types', on_delete=models.PROTECT) model = models.CharField(max_length=50) slug = models.SlugField() + part_number = models.CharField(max_length=50, blank=True, help_text="Discrete part number (optional)") u_height = models.PositiveSmallIntegerField(verbose_name='Height (U)', default=1) is_full_depth = models.BooleanField(default=True, verbose_name="Is full depth", help_text="Device consumes both front and rear rack faces") diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index dfe2544fe..373a2e0c0 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -102,13 +102,25 @@ class RackTable(BaseTable): group = tables.Column(accessor=Accessor('group.name'), verbose_name='Group') facility_id = tables.Column(verbose_name='Facility ID') u_height = tables.Column(verbose_name='Height (U)') + devices = tables.Column(accessor=Accessor('device_count'), verbose_name='Devices') u_consumed = tables.Column(accessor=Accessor('u_consumed'), verbose_name='Used (U)') utilization = tables.TemplateColumn(UTILIZATION_GRAPH, orderable=False, verbose_name='Utilization') - devices = tables.Column(accessor=Accessor('device_count'), verbose_name='Devices') class Meta(BaseTable.Meta): model = Rack - fields = ('pk', 'name', 'site', 'group', 'facility_id', 'u_height', 'devices') + fields = ('pk', 'name', 'site', 'group', 'facility_id', 'u_height', 'devices', 'u_consumed', 'utilization') + + +class RackImportTable(BaseTable): + name = tables.LinkColumn('dcim:rack', args=[Accessor('pk')], verbose_name='Name') + site = tables.LinkColumn('dcim:site', args=[Accessor('site.slug')], verbose_name='Site') + group = tables.Column(accessor=Accessor('group.name'), verbose_name='Group') + facility_id = tables.Column(verbose_name='Facility ID') + u_height = tables.Column(verbose_name='Height (U)') + + class Meta(BaseTable.Meta): + model = Rack + fields = ('site', 'group', 'name', 'facility_id', 'u_height') # @@ -133,93 +145,77 @@ class ManufacturerTable(BaseTable): class DeviceTypeTable(BaseTable): pk = ToggleColumn() + manufacturer = tables.Column(verbose_name='Manufacturer') model = tables.LinkColumn('dcim:devicetype', args=[Accessor('pk')], verbose_name='Device Type') + part_number = tables.Column(verbose_name='Part Number') class Meta(BaseTable.Meta): model = DeviceType - fields = ('pk', 'model', 'manufacturer', 'u_height') + fields = ('pk', 'model', 'manufacturer', 'part_number', 'u_height') # # Device type components # -class ConsolePortTemplateTable(tables.Table): +class ConsolePortTemplateTable(BaseTable): pk = ToggleColumn() - class Meta: + class Meta(BaseTable.Meta): model = ConsolePortTemplate fields = ('pk', 'name') empty_text = "None" show_header = False - attrs = { - 'class': 'table table-hover', - } -class ConsoleServerPortTemplateTable(tables.Table): +class ConsoleServerPortTemplateTable(BaseTable): pk = ToggleColumn() - class Meta: + class Meta(BaseTable.Meta): model = ConsoleServerPortTemplate fields = ('pk', 'name') empty_text = "None" show_header = False - attrs = { - 'class': 'table table-hover', - } -class PowerPortTemplateTable(tables.Table): +class PowerPortTemplateTable(BaseTable): pk = ToggleColumn() - class Meta: + class Meta(BaseTable.Meta): model = PowerPortTemplate fields = ('pk', 'name') empty_text = "None" show_header = False - attrs = { - 'class': 'table table-hover', - } -class PowerOutletTemplateTable(tables.Table): +class PowerOutletTemplateTable(BaseTable): pk = ToggleColumn() - class Meta: + class Meta(BaseTable.Meta): model = PowerOutletTemplate fields = ('pk', 'name') empty_text = "None" show_header = False - attrs = { - 'class': 'table table-hover', - } -class InterfaceTemplateTable(tables.Table): +class InterfaceTemplateTable(BaseTable): pk = ToggleColumn() - class Meta: + class Meta(BaseTable.Meta): model = InterfaceTemplate - fields = ('pk', 'name') + fields = ('pk', 'name', 'form_factor') empty_text = "None" show_header = False - attrs = { - 'class': 'table table-hover panel-body', - } -class DeviceBayTemplateTable(tables.Table): +class DeviceBayTemplateTable(BaseTable): pk = ToggleColumn() - class Meta: + class Meta(BaseTable.Meta): model = DeviceBayTemplate fields = ('pk', 'name') empty_text = "None" show_header = False - attrs = { - 'class': 'table table-hover panel-body', - } # diff --git a/netbox/dcim/tests/test_apis.py b/netbox/dcim/tests/test_apis.py index b68764482..22128ba29 100644 --- a/netbox/dcim/tests/test_apis.py +++ b/netbox/dcim/tests/test_apis.py @@ -204,6 +204,7 @@ class DeviceTypeTest(APITestCase): 'manufacturer', 'model', 'slug', + 'part_number', 'u_height', 'is_full_depth', 'is_console_server', diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index 52bfcdfdb..ea9d96211 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -50,31 +50,29 @@ urlpatterns = [ url(r'^device-types/(?P\d+)/edit/$', views.DeviceTypeEditView.as_view(), name='devicetype_edit'), url(r'^device-types/(?P\d+)/delete/$', views.DeviceTypeDeleteView.as_view(), name='devicetype_delete'), - # Component templates - url(r'^device-types/(?P\d+)/console-ports/add/$', views.ConsolePortTemplateAddView.as_view(), - name='devicetype_add_consoleport'), - url(r'^device-types/(?P\d+)/console-ports/delete/$', views.component_template_delete, - {'model': ConsolePortTemplate}, name='devicetype_delete_consoleport'), - url(r'^device-types/(?P\d+)/console-server-ports/add/$', views.ConsoleServerPortTemplateAddView.as_view(), - name='devicetype_add_consoleserverport'), - url(r'^device-types/(?P\d+)/console-server-ports/delete/$', views.component_template_delete, - {'model': ConsoleServerPortTemplate}, name='devicetype_delete_consoleserverport'), - url(r'^device-types/(?P\d+)/power-ports/add/$', views.PowerPortTemplateAddView.as_view(), - name='devicetype_add_powerport'), - url(r'^device-types/(?P\d+)/power-ports/delete/$', views.component_template_delete, - {'model': PowerPortTemplate}, name='devicetype_delete_powerport'), - url(r'^device-types/(?P\d+)/power-outlets/add/$', views.PowerOutletTemplateAddView.as_view(), - name='devicetype_add_poweroutlet'), - url(r'^device-types/(?P\d+)/power-outlets/delete/$', views.component_template_delete, - {'model': PowerOutletTemplate}, name='devicetype_delete_poweroutlet'), - url(r'^device-types/(?P\d+)/interfaces/add/$', views.InterfaceTemplateAddView.as_view(), - name='devicetype_add_interface'), - url(r'^device-types/(?P\d+)/interfaces/delete/$', views.component_template_delete, - {'model': InterfaceTemplate}, name='devicetype_delete_interface'), - url(r'^device-types/(?P\d+)/device-bays/add/$', views.DeviceBayTemplateAddView.as_view(), - name='devicetype_add_devicebay'), - url(r'^device-types/(?P\d+)/device-bays/delete/$', views.component_template_delete, - {'model': DeviceBayTemplate}, name='devicetype_delete_devicebay'), + # Console port templates + url(r'^device-types/(?P\d+)/console-ports/add/$', views.ConsolePortTemplateAddView.as_view(), name='devicetype_add_consoleport'), + url(r'^device-types/(?P\d+)/console-ports/delete/$', views.ConsolePortTemplateBulkDeleteView.as_view(), name='devicetype_delete_consoleport'), + + # Console server port templates + url(r'^device-types/(?P\d+)/console-server-ports/add/$', views.ConsoleServerPortTemplateAddView.as_view(), name='devicetype_add_consoleserverport'), + url(r'^device-types/(?P\d+)/console-server-ports/delete/$', views.ConsoleServerPortTemplateBulkDeleteView.as_view(), name='devicetype_delete_consoleserverport'), + + # Power port templates + url(r'^device-types/(?P\d+)/power-ports/add/$', views.PowerPortTemplateAddView.as_view(), name='devicetype_add_powerport'), + url(r'^device-types/(?P\d+)/power-ports/delete/$', views.PowerPortTemplateBulkDeleteView.as_view(), name='devicetype_delete_powerport'), + + # Power outlet templates + url(r'^device-types/(?P\d+)/power-outlets/add/$', views.PowerOutletTemplateAddView.as_view(), name='devicetype_add_poweroutlet'), + url(r'^device-types/(?P\d+)/power-outlets/delete/$', views.PowerOutletTemplateBulkDeleteView.as_view(), name='devicetype_delete_poweroutlet'), + + # Interface templates + url(r'^device-types/(?P\d+)/interfaces/add/$', views.InterfaceTemplateAddView.as_view(), name='devicetype_add_interface'), + url(r'^device-types/(?P\d+)/interfaces/delete/$', views.InterfaceTemplateBulkDeleteView.as_view(), name='devicetype_delete_interface'), + + # Device bay templates + url(r'^device-types/(?P\d+)/device-bays/add/$', views.DeviceBayTemplateAddView.as_view(), name='devicetype_add_devicebay'), + url(r'^device-types/(?P\d+)/device-bays/delete/$', views.DeviceBayTemplateBulkDeleteView.as_view(), name='devicetype_delete_devicebay'), # Device roles url(r'^device-roles/$', views.DeviceRoleListView.as_view(), name='devicerole_list'), @@ -105,6 +103,7 @@ urlpatterns = [ # Console ports url(r'^devices/(?P\d+)/console-ports/add/$', views.consoleport_add, name='consoleport_add'), + url(r'^devices/(?P\d+)/console-ports/delete/$', views.ConsolePortBulkDeleteView.as_view(), name='consoleport_bulk_delete'), url(r'^console-ports/(?P\d+)/connect/$', views.consoleport_connect, name='consoleport_connect'), url(r'^console-ports/(?P\d+)/disconnect/$', views.consoleport_disconnect, name='consoleport_disconnect'), url(r'^console-ports/(?P\d+)/edit/$', views.consoleport_edit, name='consoleport_edit'), @@ -112,6 +111,7 @@ urlpatterns = [ # Console server ports url(r'^devices/(?P\d+)/console-server-ports/add/$', views.consoleserverport_add, name='consoleserverport_add'), + url(r'^devices/(?P\d+)/console-server-ports/delete/$', views.ConsoleServerPortBulkDeleteView.as_view(), name='consoleserverport_bulk_delete'), url(r'^console-server-ports/(?P\d+)/connect/$', views.consoleserverport_connect, name='consoleserverport_connect'), url(r'^console-server-ports/(?P\d+)/disconnect/$', views.consoleserverport_disconnect, name='consoleserverport_disconnect'), url(r'^console-server-ports/(?P\d+)/edit/$', views.consoleserverport_edit, name='consoleserverport_edit'), @@ -119,6 +119,7 @@ urlpatterns = [ # Power ports url(r'^devices/(?P\d+)/power-ports/add/$', views.powerport_add, name='powerport_add'), + url(r'^devices/(?P\d+)/power-ports/delete/$', views.PowerPortBulkDeleteView.as_view(), name='powerport_bulk_delete'), url(r'^power-ports/(?P\d+)/connect/$', views.powerport_connect, name='powerport_connect'), url(r'^power-ports/(?P\d+)/disconnect/$', views.powerport_disconnect, name='powerport_disconnect'), url(r'^power-ports/(?P\d+)/edit/$', views.powerport_edit, name='powerport_edit'), @@ -126,6 +127,7 @@ urlpatterns = [ # Power outlets url(r'^devices/(?P\d+)/power-outlets/add/$', views.poweroutlet_add, name='poweroutlet_add'), + url(r'^devices/(?P\d+)/power-outlets/delete/$', views.PowerOutletBulkDeleteView.as_view(), name='poweroutlet_bulk_delete'), url(r'^power-outlets/(?P\d+)/connect/$', views.poweroutlet_connect, name='poweroutlet_connect'), url(r'^power-outlets/(?P\d+)/disconnect/$', views.poweroutlet_disconnect, name='poweroutlet_disconnect'), url(r'^power-outlets/(?P\d+)/edit/$', views.poweroutlet_edit, name='poweroutlet_edit'), @@ -133,6 +135,7 @@ urlpatterns = [ # Device bays url(r'^devices/(?P\d+)/bays/add/$', views.devicebay_add, name='devicebay_add'), + url(r'^devices/(?P\d+)/bays/delete/$', views.DeviceBayBulkDeleteView.as_view(), name='devicebay_bulk_delete'), url(r'^device-bays/(?P\d+)/edit/$', views.devicebay_edit, name='devicebay_edit'), url(r'^device-bays/(?P\d+)/delete/$', views.devicebay_delete, name='devicebay_delete'), url(r'^device-bays/(?P\d+)/populate/$', views.devicebay_populate, name='devicebay_populate'), @@ -147,8 +150,9 @@ urlpatterns = [ url(r'^interface-connections/import/$', views.InterfaceConnectionsBulkImportView.as_view(), name='interface_connections_import'), # Interfaces - url(r'^devices/interfaces/add/$', views.InterfaceBulkAddView.as_view(), name='interface_bulk_add'), + url(r'^devices/interfaces/add/$', views.InterfaceBulkAddView.as_view(), name='interface_add_multi'), url(r'^devices/(?P\d+)/interfaces/add/$', views.interface_add, name='interface_add'), + url(r'^devices/(?P\d+)/interfaces/delete/$', views.InterfaceBulkDeleteView.as_view(), name='interface_bulk_delete'), url(r'^devices/(?P\d+)/interface-connections/add/$', views.interfaceconnection_add, name='interfaceconnection_add'), url(r'^interface-connections/(?P\d+)/delete/$', views.interfaceconnection_delete, name='interfaceconnection_delete'), url(r'^interfaces/(?P\d+)/edit/$', views.interface_edit, name='interface_edit'), diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 5f8434bcc..464418ac8 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -7,8 +7,7 @@ from django.contrib.auth.decorators import permission_required from django.contrib.auth.mixins import PermissionRequiredMixin from django.core.exceptions import ValidationError from django.core.urlresolvers import reverse -from django.db.models import Count, ProtectedError, Sum -from django.forms import ModelMultipleChoiceField, MultipleHiddenInput +from django.db.models import Count, Sum from django.http import HttpResponseRedirect from django.shortcuts import get_object_or_404, redirect, render from django.utils.http import urlencode @@ -17,7 +16,6 @@ from django.views.generic import View from ipam.models import Prefix, IPAddress, VLAN from circuits.models import Circuit from extras.models import TopologyMap -from utilities.error_handlers import handle_protectederror from utilities.forms import ConfirmationForm from utilities.views import ( BulkDeleteView, BulkEditView, BulkImportView, ObjectDeleteView, ObjectEditView, ObjectListView, @@ -135,7 +133,6 @@ class RackGroupEditView(PermissionRequiredMixin, ObjectEditView): class RackGroupBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_rackgroup' cls = RackGroup - form = forms.RackGroupBulkDeleteForm default_redirect_url = 'dcim:rackgroup_list' @@ -188,7 +185,7 @@ class RackDeleteView(PermissionRequiredMixin, ObjectDeleteView): class RackBulkImportView(PermissionRequiredMixin, BulkImportView): permission_required = 'dcim.add_rack' form = forms.RackImportForm - table = tables.RackTable + table = tables.RackImportTable template_name = 'dcim/rack_import.html' obj_list_url = 'dcim:rack_list' @@ -213,7 +210,6 @@ class RackBulkEditView(PermissionRequiredMixin, BulkEditView): class RackBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_rack' cls = Rack - form = forms.RackBulkDeleteForm default_redirect_url = 'dcim:rack_list' @@ -239,7 +235,6 @@ class ManufacturerEditView(PermissionRequiredMixin, ObjectEditView): class ManufacturerBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_manufacturer' cls = Manufacturer - form = forms.ManufacturerBulkDeleteForm default_redirect_url = 'dcim:manufacturer_list' @@ -334,7 +329,6 @@ class DeviceTypeBulkEditView(PermissionRequiredMixin, BulkEditView): class DeviceTypeBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_devicetype' cls = DeviceType - form = forms.DeviceTypeBulkDeleteForm default_redirect_url = 'dcim:devicetype_list' @@ -396,68 +390,65 @@ class ConsolePortTemplateAddView(ComponentTemplateCreateView): form = forms.ConsolePortTemplateForm +class ConsolePortTemplateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): + permission_required = 'dcim.delete_consoleporttemplate' + cls = ConsolePortTemplate + parent_cls = DeviceType + + class ConsoleServerPortTemplateAddView(ComponentTemplateCreateView): model = ConsoleServerPortTemplate form = forms.ConsoleServerPortTemplateForm +class ConsoleServerPortTemplateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): + permission_required = 'dcim.delete_consoleserverporttemplate' + cls = ConsoleServerPortTemplate + parent_cls = DeviceType + + class PowerPortTemplateAddView(ComponentTemplateCreateView): model = PowerPortTemplate form = forms.PowerPortTemplateForm +class PowerPortTemplateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): + permission_required = 'dcim.delete_powerporttemplate' + cls = PowerPortTemplate + parent_cls = DeviceType + + class PowerOutletTemplateAddView(ComponentTemplateCreateView): model = PowerOutletTemplate form = forms.PowerOutletTemplateForm +class PowerOutletTemplateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): + permission_required = 'dcim.delete_poweroutlettemplate' + cls = PowerOutletTemplate + parent_cls = DeviceType + + class InterfaceTemplateAddView(ComponentTemplateCreateView): model = InterfaceTemplate form = forms.InterfaceTemplateForm +class InterfaceTemplateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): + permission_required = 'dcim.delete_interfacetemplate' + cls = InterfaceTemplate + parent_cls = DeviceType + + class DeviceBayTemplateAddView(ComponentTemplateCreateView): model = DeviceBayTemplate form = forms.DeviceBayTemplateForm -def component_template_delete(request, pk, model): - - devicetype = get_object_or_404(DeviceType, pk=pk) - - class ComponentTemplateBulkDeleteForm(ConfirmationForm): - pk = ModelMultipleChoiceField(queryset=model.objects.all(), widget=MultipleHiddenInput) - - if '_confirm' in request.POST: - form = ComponentTemplateBulkDeleteForm(request.POST) - if form.is_valid(): - - # Delete component templates - objects_to_delete = model.objects.filter(pk__in=[v.id for v in form.cleaned_data['pk']]) - try: - deleted_count = objects_to_delete.count() - objects_to_delete.delete() - except ProtectedError, e: - handle_protectederror(list(objects_to_delete), request, e) - return redirect('dcim:devicetype', {'pk': devicetype.pk}) - - messages.success(request, "Deleted {} {}".format(deleted_count, model._meta.verbose_name_plural)) - return redirect('dcim:devicetype', pk=devicetype.pk) - - else: - form = ComponentTemplateBulkDeleteForm(initial={'pk': request.POST.getlist('pk')}) - - selected_objects = model.objects.filter(pk__in=request.POST.getlist('pk')) - if not selected_objects: - messages.warning(request, "No {} were selected for deletion.".format(model._meta.verbose_name_plural)) - return redirect('dcim:devicetype', pk=devicetype.pk) - - return render(request, 'dcim/component_template_delete.html', { - 'devicetype': devicetype, - 'form': form, - 'selected_objects': selected_objects, - 'cancel_url': reverse('dcim:devicetype', kwargs={'pk': devicetype.pk}), - }) +class DeviceBayTemplateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): + permission_required = 'dcim.delete_devicebaytemplate' + cls = DeviceBayTemplate + parent_cls = DeviceType # @@ -482,7 +473,6 @@ class DeviceRoleEditView(PermissionRequiredMixin, ObjectEditView): class DeviceRoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_devicerole' cls = DeviceRole - form = forms.DeviceRoleBulkDeleteForm default_redirect_url = 'dcim:devicerole_list' @@ -508,7 +498,6 @@ class PlatformEditView(PermissionRequiredMixin, ObjectEditView): class PlatformBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_platform' cls = Platform - form = forms.PlatformBulkDeleteForm default_redirect_url = 'dcim:platform_list' @@ -653,7 +642,6 @@ class DeviceBulkEditView(PermissionRequiredMixin, BulkEditView): class DeviceBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_device' cls = Device - form = forms.DeviceBulkDeleteForm default_redirect_url = 'dcim:device_list' @@ -825,6 +813,12 @@ def consoleport_delete(request, pk): }) +class ConsolePortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): + permission_required = 'dcim.delete_consoleport' + cls = ConsolePort + parent_cls = Device + + class ConsoleConnectionsBulkImportView(PermissionRequiredMixin, BulkImportView): permission_required = 'dcim.change_consoleport' form = forms.ConsoleConnectionImportForm @@ -980,6 +974,12 @@ def consoleserverport_delete(request, pk): }) +class ConsoleServerPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): + permission_required = 'dcim.delete_consoleserverport' + cls = ConsoleServerPort + parent_cls = Device + + # # Power ports # @@ -1125,6 +1125,12 @@ def powerport_delete(request, pk): }) +class PowerPortBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): + permission_required = 'dcim.delete_powerport' + cls = PowerPort + parent_cls = Device + + class PowerConnectionsBulkImportView(PermissionRequiredMixin, BulkImportView): permission_required = 'dcim.change_powerport' form = forms.PowerConnectionImportForm @@ -1278,6 +1284,12 @@ def poweroutlet_delete(request, pk): }) +class PowerOutletBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): + permission_required = 'dcim.delete_poweroutlet' + cls = PowerOutlet + parent_cls = Device + + # # Interfaces # @@ -1372,7 +1384,7 @@ class InterfaceBulkAddView(PermissionRequiredMixin, BulkEditView): permission_required = 'dcim.add_interface' cls = Device form = forms.InterfaceBulkCreateForm - template_name = 'dcim/interface_bulk_add.html' + template_name = 'dcim/interface_add_multi.html' default_redirect_url = 'dcim:device_list' def update_objects(self, pk_list, form): @@ -1401,6 +1413,12 @@ class InterfaceBulkAddView(PermissionRequiredMixin, BulkEditView): len(selected_devices))) +class InterfaceBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): + permission_required = 'dcim.delete_interface' + cls = Interface + parent_cls = Device + + # # Device bays # @@ -1538,6 +1556,12 @@ def devicebay_depopulate(request, pk): }) +class DeviceBayBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): + permission_required = 'dcim.delete_devicebay' + cls = DeviceBay + parent_cls = Device + + # # Interface connections # diff --git a/netbox/extras/models.py b/netbox/extras/models.py index 229debfd6..2f7618680 100644 --- a/netbox/extras/models.py +++ b/netbox/extras/models.py @@ -77,7 +77,7 @@ class ExportTemplate(models.Model): ] def __unicode__(self): - return "{}: {}".format(self.content_type, self.name) + return u'{}: {}'.format(self.content_type, self.name) def to_response(self, context_dict, filename): """ @@ -176,8 +176,8 @@ class UserAction(models.Model): def __unicode__(self): if self.message: - return ' '.join([self.user, self.message]) - return ' '.join([self.user, self.get_action_display(), self.content_type]) + return u'{} {}'.format(self.user, self.message) + return u'{} {} {}'.format(self.user, self.get_action_display(), self.content_type) def icon(self): if self.action in [ACTION_CREATE, ACTION_IMPORT]: diff --git a/netbox/ipam/api/serializers.py b/netbox/ipam/api/serializers.py index c3d442fdf..bda8b1076 100644 --- a/netbox/ipam/api/serializers.py +++ b/netbox/ipam/api/serializers.py @@ -102,7 +102,7 @@ class VLANSerializer(serializers.ModelSerializer): class Meta: model = VLAN - fields = ['id', 'site', 'group', 'vid', 'name', 'status', 'role', 'display_name'] + fields = ['id', 'site', 'group', 'vid', 'name', 'status', 'role', 'description', 'display_name'] class VLANNestedSerializer(VLANSerializer): diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py index f542f9bdd..c2286122c 100644 --- a/netbox/ipam/forms.py +++ b/netbox/ipam/forms.py @@ -4,9 +4,7 @@ from django import forms from django.db.models import Count from dcim.models import Site, Device, Interface -from utilities.forms import ( - BootstrapMixin, ConfirmationForm, APISelect, Livesearch, CSVDataField, BulkImportForm, SlugField, -) +from utilities.forms import BootstrapMixin, APISelect, Livesearch, CSVDataField, BulkImportForm, SlugField from .models import ( Aggregate, IPAddress, Prefix, PREFIX_STATUS_CHOICES, RIR, Role, VLAN, VLANGroup, VLAN_STATUS_CHOICES, VRF, @@ -50,10 +48,6 @@ class VRFBulkEditForm(forms.Form, BootstrapMixin): description = forms.CharField(max_length=100, required=False) -class VRFBulkDeleteForm(ConfirmationForm): - pk = forms.ModelMultipleChoiceField(queryset=VRF.objects.all(), widget=forms.MultipleHiddenInput) - - # # RIRs # @@ -66,10 +60,6 @@ class RIRForm(forms.ModelForm, BootstrapMixin): fields = ['name', 'slug'] -class RIRBulkDeleteForm(ConfirmationForm): - pk = forms.ModelMultipleChoiceField(queryset=RIR.objects.all(), widget=forms.MultipleHiddenInput) - - # # Aggregates # @@ -103,11 +93,7 @@ class AggregateBulkEditForm(forms.Form, BootstrapMixin): pk = forms.ModelMultipleChoiceField(queryset=Aggregate.objects.all(), widget=forms.MultipleHiddenInput) rir = forms.ModelChoiceField(queryset=RIR.objects.all(), required=False, label='RIR') date_added = forms.DateField(required=False) - description = forms.CharField(max_length=50, required=False) - - -class AggregateBulkDeleteForm(ConfirmationForm): - pk = forms.ModelMultipleChoiceField(queryset=Aggregate.objects.all(), widget=forms.MultipleHiddenInput) + description = forms.CharField(max_length=100, required=False) def aggregate_rir_choices(): @@ -132,10 +118,6 @@ class RoleForm(forms.ModelForm, BootstrapMixin): fields = ['name', 'slug'] -class RoleBulkDeleteForm(ConfirmationForm): - pk = forms.ModelMultipleChoiceField(queryset=Role.objects.all(), widget=forms.MultipleHiddenInput) - - # # Prefixes # @@ -251,11 +233,7 @@ class PrefixBulkEditForm(forms.Form, BootstrapMixin): vrf_global = forms.BooleanField(required=False, label='Set VRF to global') status = forms.ChoiceField(choices=FORM_PREFIX_STATUS_CHOICES, required=False) role = forms.ModelChoiceField(queryset=Role.objects.all(), required=False) - description = forms.CharField(max_length=50, required=False) - - -class PrefixBulkDeleteForm(ConfirmationForm): - pk = forms.ModelMultipleChoiceField(queryset=Prefix.objects.all(), widget=forms.MultipleHiddenInput) + description = forms.CharField(max_length=100, required=False) def prefix_vrf_choices(): @@ -415,11 +393,7 @@ class IPAddressBulkEditForm(forms.Form, BootstrapMixin): vrf = forms.ModelChoiceField(queryset=VRF.objects.all(), required=False, label='VRF', help_text="Select the VRF to assign, or check below to remove VRF assignment") vrf_global = forms.BooleanField(required=False, label='Set VRF to global') - description = forms.CharField(max_length=50, required=False) - - -class IPAddressBulkDeleteForm(ConfirmationForm): - pk = forms.ModelMultipleChoiceField(queryset=IPAddress.objects.all(), widget=forms.MultipleHiddenInput) + description = forms.CharField(max_length=100, required=False) def ipaddress_family_choices(): @@ -449,10 +423,6 @@ class VLANGroupForm(forms.ModelForm, BootstrapMixin): fields = ['site', 'name', 'slug'] -class VLANGroupBulkDeleteForm(ConfirmationForm): - pk = forms.ModelMultipleChoiceField(queryset=VLANGroup.objects.all(), widget=forms.MultipleHiddenInput) - - def vlangroup_site_choices(): site_choices = Site.objects.annotate(vlangroup_count=Count('vlan_groups')) return [(s.slug, u'{} ({})'.format(s.name, s.vlangroup_count)) for s in site_choices] @@ -474,7 +444,7 @@ class VLANForm(forms.ModelForm, BootstrapMixin): class Meta: model = VLAN - fields = ['site', 'group', 'vid', 'name', 'status', 'role'] + fields = ['site', 'group', 'vid', 'name', 'description', 'status', 'role'] help_texts = { 'site': "The site at which this VLAN exists", 'group': "VLAN group (optional)", @@ -511,7 +481,7 @@ class VLANFromCSVForm(forms.ModelForm): class Meta: model = VLAN - fields = ['site', 'group', 'vid', 'name', 'status_name', 'role'] + fields = ['site', 'group', 'vid', 'name', 'status_name', 'role', 'description'] def save(self, *args, **kwargs): m = super(VLANFromCSVForm, self).save(commit=False) @@ -532,10 +502,7 @@ class VLANBulkEditForm(forms.Form, BootstrapMixin): group = forms.ModelChoiceField(queryset=VLANGroup.objects.all(), required=False) status = forms.ChoiceField(choices=FORM_VLAN_STATUS_CHOICES, required=False) role = forms.ModelChoiceField(queryset=Role.objects.all(), required=False) - - -class VLANBulkDeleteForm(ConfirmationForm): - pk = forms.ModelMultipleChoiceField(queryset=VLAN.objects.all(), widget=forms.MultipleHiddenInput) + description = forms.CharField(max_length=100, required=False) def vlan_site_choices(): diff --git a/netbox/ipam/migrations/0005_auto_20160725_1842.py b/netbox/ipam/migrations/0005_auto_20160725_1842.py new file mode 100644 index 000000000..17eee6e8c --- /dev/null +++ b/netbox/ipam/migrations/0005_auto_20160725_1842.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.8 on 2016-07-25 18:42 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ipam', '0004_ipam_vlangroup_uniqueness'), + ] + + operations = [ + migrations.AddField( + model_name='vlan', + name='description', + field=models.CharField(blank=True, max_length=100), + ), + migrations.AlterField( + model_name='vlan', + name='name', + field=models.CharField(max_length=64), + ), + ] diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index 0aa971ae3..510d8410a 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -406,7 +406,8 @@ class VLAN(CreatedUpdatedModel): MinValueValidator(1), MaxValueValidator(4094) ]) - name = models.CharField(max_length=30) + name = models.CharField(max_length=64) + description = models.CharField(max_length=100, blank=True) status = models.PositiveSmallIntegerField('Status', choices=VLAN_STATUS_CHOICES, default=1) role = models.ForeignKey('Role', related_name='vlans', on_delete=models.SET_NULL, blank=True, null=True) @@ -434,10 +435,12 @@ class VLAN(CreatedUpdatedModel): def to_csv(self): return ','.join([ self.site.name, + self.group.name if self.group else '', str(self.vid), self.name, self.get_status_display(), self.role.name if self.role else '', + self.description, ]) @property diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index ea980c2c6..193adf273 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -95,7 +95,6 @@ class VRFBulkEditView(PermissionRequiredMixin, BulkEditView): class VRFBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'ipam.delete_vrf' cls = VRF - form = forms.VRFBulkDeleteForm default_redirect_url = 'ipam:vrf_list' @@ -121,7 +120,6 @@ class RIREditView(PermissionRequiredMixin, ObjectEditView): class RIRBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'ipam.delete_rir' cls = RIR - form = forms.RIRBulkDeleteForm default_redirect_url = 'ipam:rir_list' @@ -217,7 +215,6 @@ class AggregateBulkEditView(PermissionRequiredMixin, BulkEditView): class AggregateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'ipam.delete_aggregate' cls = Aggregate - form = forms.AggregateBulkDeleteForm default_redirect_url = 'ipam:aggregate_list' @@ -243,7 +240,6 @@ class RoleEditView(PermissionRequiredMixin, ObjectEditView): class RoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'ipam.delete_role' cls = Role - form = forms.RoleBulkDeleteForm default_redirect_url = 'ipam:role_list' @@ -354,7 +350,6 @@ class PrefixBulkEditView(PermissionRequiredMixin, BulkEditView): class PrefixBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'ipam.delete_prefix' cls = Prefix - form = forms.PrefixBulkDeleteForm default_redirect_url = 'ipam:prefix_list' @@ -479,7 +474,6 @@ class IPAddressBulkEditView(PermissionRequiredMixin, BulkEditView): class IPAddressBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'ipam.delete_ipaddress' cls = IPAddress - form = forms.IPAddressBulkDeleteForm default_redirect_url = 'ipam:ipaddress_list' @@ -506,7 +500,6 @@ class VLANGroupEditView(PermissionRequiredMixin, ObjectEditView): class VLANGroupBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'ipam.delete_vlangroup' cls = VLANGroup - form = forms.VLANGroupBulkDeleteForm default_redirect_url = 'ipam:vlangroup_list' @@ -565,7 +558,7 @@ class VLANBulkEditView(PermissionRequiredMixin, BulkEditView): def update_objects(self, pk_list, form): fields_to_update = {} - for field in ['site', 'group', 'status', 'role']: + for field in ['site', 'group', 'status', 'role', 'description']: if form.cleaned_data[field]: fields_to_update[field] = form.cleaned_data[field] @@ -575,5 +568,4 @@ class VLANBulkEditView(PermissionRequiredMixin, BulkEditView): class VLANBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'ipam.delete_vlan' cls = VLAN - form = forms.VLANBulkDeleteForm default_redirect_url = 'ipam:vlan_list' diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 7c916ed84..5d61f83d5 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -12,7 +12,7 @@ except ImportError: "the documentation.") -VERSION = '1.3.1' +VERSION = '1.3.2' # Import local configuration for setting in ['ALLOWED_HOSTS', 'DATABASE', 'SECRET_KEY']: diff --git a/netbox/project-static/js/secrets.js b/netbox/project-static/js/secrets.js index 21d8656e6..181984b71 100644 --- a/netbox/project-static/js/secrets.js +++ b/netbox/project-static/js/secrets.js @@ -10,15 +10,16 @@ $(document).ready(function() { $('#privkey_modal').modal('show'); } else { unlock_secret(secret_id, private_key); - $(this).hide(); - $(this).siblings('button.lock-secret').show(); } }); // Locking a secret $('button.lock-secret').click(function (event) { var secret_id = $(this).attr('secret-id'); - $('#secret_' + secret_id).html('********'); + var secret_div = $('#secret_' + secret_id); + + // Delete the plaintext + secret_div.html('********'); $(this).hide(); $(this).siblings('button.unlock-secret').show(); }); @@ -81,13 +82,16 @@ $(document).ready(function() { xhr.setRequestHeader("X-CSRFToken", csrf_token); }, success: function (response, status) { - var secret_plaintext = response.plaintext; - $('#secret_' + secret_id).html(secret_plaintext); - return true; + $('#secret_' + secret_id).html(response.plaintext); + $('button.unlock-secret').hide(); + $('button.lock-secret').show(); }, error: function (xhr, ajaxOptions, thrownError) { if (xhr.status == 403) { - alert("Decryption failed: " + xhr.statusText); + alert("Permission denied"); + } else { + var json = jQuery.parseJSON(xhr.responseText); + alert("Decryption failed: " + json['error']); } } }); diff --git a/netbox/secrets/forms.py b/netbox/secrets/forms.py index 95f281502..06c963957 100644 --- a/netbox/secrets/forms.py +++ b/netbox/secrets/forms.py @@ -5,7 +5,7 @@ from django import forms from django.db.models import Count from dcim.models import Device -from utilities.forms import BootstrapMixin, BulkImportForm, ConfirmationForm, CSVDataField, SlugField +from utilities.forms import BootstrapMixin, BulkImportForm, CSVDataField, SlugField from .models import Secret, SecretRole, UserKey @@ -42,10 +42,6 @@ class SecretRoleForm(forms.ModelForm, BootstrapMixin): fields = ['name', 'slug'] -class SecretRoleBulkDeleteForm(ConfirmationForm): - pk = forms.ModelMultipleChoiceField(queryset=SecretRole.objects.all(), widget=forms.MultipleHiddenInput) - - # # Secrets # @@ -97,10 +93,6 @@ class SecretBulkEditForm(forms.Form, BootstrapMixin): name = forms.CharField(max_length=100, required=False) -class SecretBulkDeleteForm(ConfirmationForm): - pk = forms.ModelMultipleChoiceField(queryset=Secret.objects.all(), widget=forms.MultipleHiddenInput) - - def secret_role_choices(): role_choices = SecretRole.objects.annotate(secret_count=Count('secrets')) return [(r.slug, u'{} ({})'.format(r.name, r.secret_count)) for r in role_choices] diff --git a/netbox/secrets/views.py b/netbox/secrets/views.py index d9d712466..6e50d83fd 100644 --- a/netbox/secrets/views.py +++ b/netbox/secrets/views.py @@ -37,7 +37,6 @@ class SecretRoleEditView(PermissionRequiredMixin, ObjectEditView): class SecretRoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'secrets.delete_secretrole' cls = SecretRole - form = forms.SecretRoleBulkDeleteForm default_redirect_url = 'secrets:secretrole_list' @@ -219,5 +218,4 @@ class SecretBulkEditView(PermissionRequiredMixin, BulkEditView): class SecretBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'secrets.delete_secret' cls = Secret - form = forms.SecretBulkDeleteForm default_redirect_url = 'secrets:secret_list' diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 0f405b68e..700a001bc 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -289,100 +289,180 @@
{% if device_bays or device.device_type.is_parent_device %} + {% if perms.dcim.delete_devicebay %} +
+ {% csrf_token %} + {% endif %}
Device Bays
{% for devicebay in device_bays %} - {% include 'dcim/inc/_devicebay.html' %} + {% include 'dcim/inc/_devicebay.html' with selectable=True %} {% empty %} {% endfor %}
No device bays defined
- {% if perms.dcim.add_devicebay %} -
- - - Add device bays - -
+ {% if perms.dcim.add_devicebay or perms.dcim.delete_devicebay %} +
+
+
+ {% if device_bays and perms.dcim.delete_devicebay %} + + {% endif %} +
+
+ {% if perms.dcim.add_devicebay %} + + + Add device bay + + {% endif %} +
+
+
{% endif %}
+ {% if perms.dcim.delete_devicebay %} +
+ {% endif %} {% endif %} {% if interfaces or device.device_type.is_network_device %} + {% if perms.dcim.delete_interface %} +
+ {% csrf_token %} + {% endif %}
Interfaces
{% for iface in interfaces %} - {% include 'dcim/inc/_interface.html' %} + {% include 'dcim/inc/_interface.html' with selectable=True %} {% empty %} {% endfor %}
No interfaces defined
- {% if perms.dcim.add_interface %} -
- - - Add interface - + {% if perms.dcim.add_interface or perms.dcim.delete_interface %} +
+
+
+ {% if interfaces and perms.dcim.delete_interface %} + + {% endif %} +
+
+ {% if perms.dcim.add_interface %} + + + Add interface + + {% endif %} +
+
{% endif %}
+ {% if perms.dcim.delete_interface %} + + {% endif %} {% endif %} {% if cs_ports or device.device_type.is_console_server %} + {% if perms.dcim.delete_consoleserverport %} +
+ {% csrf_token %} + {% endif %}
Console Server Ports
{% for csp in cs_ports %} - {% include 'dcim/inc/_consoleserverport.html' %} + {% include 'dcim/inc/_consoleserverport.html' with selectable=True %} {% empty %} {% endfor %}
No console server ports defined
- {% if perms.dcim.add_consoleserverport %} -
- - - Add console server ports - + {% if perms.dcim.add_consoleserverport or perms.dcim.delete_consoleserverport %} +
+
+
+ {% if cs_ports and perms.dcim.delete_consoleserverport %} + + {% endif %} +
+
+ {% if perms.dcim.add_consoleserverport %} + + + Add console server ports + + {% endif %} +
+
{% endif %}
+ {% if perms.dcim.delete_consoleserverport %} + + {% endif %} {% endif %} {% if power_outlets or device.device_type.is_pdu %} + {% if perms.dcim.delete_poweroutlet %} +
+ {% csrf_token %} + {% endif %}
Power Outlets
{% for po in power_outlets %} - {% include 'dcim/inc/_poweroutlet.html' %} + {% include 'dcim/inc/_poweroutlet.html' with selectable=True %} {% empty %} {% endfor %}
No power outlets defined
- {% if perms.dcim.add_poweroutlet %} -
- - - Add power outlets - + {% if perms.dcim.add_poweroutlet or perms.dcim.delete_poweroutlet %} +
+
+
+ {% if power_outlets and perms.dcim.delete_poweroutlet %} + + {% endif %} +
+
+ {% if perms.dcim.add_poweroutlet %} + + + Add power outlets + + {% endif %} +
+
{% endif %}
+ {% if perms.dcim.delete_poweroutlet %} + + {% endif %} {% endif %}
diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html index df567a102..ce1b69a22 100644 --- a/netbox/templates/dcim/devicetype.html +++ b/netbox/templates/dcim/devicetype.html @@ -48,6 +48,16 @@ Model Name {{ devicetype.model }} + + Part Number + + {% if devicetype.part_number %} + {{ devicetype.part_number }} + {% else %} + N/A + {% endif %} + + Height (U) {{ devicetype.u_height }} diff --git a/netbox/templates/dcim/inc/_consoleport.html b/netbox/templates/dcim/inc/_consoleport.html index 373d41204..43b353bb1 100644 --- a/netbox/templates/dcim/inc/_consoleport.html +++ b/netbox/templates/dcim/inc/_consoleport.html @@ -1,4 +1,9 @@ + {% if selectable and perms.dcim.delete_consoleport %} + + + + {% endif %} {{ cp.name }} diff --git a/netbox/templates/dcim/inc/_consoleserverport.html b/netbox/templates/dcim/inc/_consoleserverport.html index 3d6308e2b..b9c5e8e59 100644 --- a/netbox/templates/dcim/inc/_consoleserverport.html +++ b/netbox/templates/dcim/inc/_consoleserverport.html @@ -1,4 +1,9 @@ + {% if selectable and perms.dcim.delete_consoleserverport %} + + + + {% endif %} {{ csp.name }} diff --git a/netbox/templates/dcim/inc/_devicebay.html b/netbox/templates/dcim/inc/_devicebay.html index b9fbf1395..aaa9099c6 100644 --- a/netbox/templates/dcim/inc/_devicebay.html +++ b/netbox/templates/dcim/inc/_devicebay.html @@ -1,4 +1,9 @@ + {% if selectable and perms.dcim.delete_devicebay %} + + + + {% endif %} {{ devicebay.name }} diff --git a/netbox/templates/dcim/inc/_interface.html b/netbox/templates/dcim/inc/_interface.html index fc435ce98..0c9d17751 100644 --- a/netbox/templates/dcim/inc/_interface.html +++ b/netbox/templates/dcim/inc/_interface.html @@ -1,4 +1,9 @@ + {% if selectable and perms.dcim.delete_interface %} + + + + {% endif %} {{ iface.name }} {% if iface.description %} diff --git a/netbox/templates/dcim/inc/_poweroutlet.html b/netbox/templates/dcim/inc/_poweroutlet.html index b77252cc1..18619a37d 100644 --- a/netbox/templates/dcim/inc/_poweroutlet.html +++ b/netbox/templates/dcim/inc/_poweroutlet.html @@ -1,4 +1,9 @@ + {% if selectable and perms.dcim.delete_poweroutlet %} + + + + {% endif %} {{ po.name }} diff --git a/netbox/templates/dcim/inc/_powerport.html b/netbox/templates/dcim/inc/_powerport.html index 077cc7aa6..7d519599d 100644 --- a/netbox/templates/dcim/inc/_powerport.html +++ b/netbox/templates/dcim/inc/_powerport.html @@ -1,4 +1,9 @@ + {% if selectable and perms.dcim.delete_powerport %} + + + + {% endif %} {{ pp.name }} diff --git a/netbox/templates/dcim/inc/device_table.html b/netbox/templates/dcim/inc/device_table.html index 38ab5fe36..2f585968f 100644 --- a/netbox/templates/dcim/inc/device_table.html +++ b/netbox/templates/dcim/inc/device_table.html @@ -7,7 +7,7 @@ {% render_table table table_template|default:'table.html' %} {% if perms.dcim.add_interface %} - diff --git a/netbox/templates/dcim/interface_bulk_add.html b/netbox/templates/dcim/interface_add_multi.html similarity index 100% rename from netbox/templates/dcim/interface_bulk_add.html rename to netbox/templates/dcim/interface_add_multi.html diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html index 1fc0d2287..8adbcd1be 100644 --- a/netbox/templates/ipam/vlan.html +++ b/netbox/templates/ipam/vlan.html @@ -69,6 +69,16 @@ Name {{ vlan.name }} + + Description + + {% if vlan.description %} + {{ vlan.description }} + {% else %} + None + {% endif %} + + Status diff --git a/netbox/templates/ipam/vlan_bulk_edit.html b/netbox/templates/ipam/vlan_bulk_edit.html index 5e8b684d4..67f98be08 100644 --- a/netbox/templates/ipam/vlan_bulk_edit.html +++ b/netbox/templates/ipam/vlan_bulk_edit.html @@ -11,6 +11,7 @@ {{ vlan.site }} {{ vlan.status }} {{ vlan.role }} + {{ vlan.description }} {% endfor %} {% endblock %} diff --git a/netbox/templates/ipam/vlan_import.html b/netbox/templates/ipam/vlan_import.html index ba1265c3f..affee3c18 100644 --- a/netbox/templates/ipam/vlan_import.html +++ b/netbox/templates/ipam/vlan_import.html @@ -58,10 +58,15 @@ Functional role (optional) Security + + Description + Short description (optional) + Security team only +

Example

- 
LAS2,Backend Network,1400,Cameras,Active,Security
+ 
LAS2,Backend Network,1400,Cameras,Active,Security,Security team only
{% endblock %} diff --git a/netbox/templates/secrets/inc/private_key_modal.html b/netbox/templates/secrets/inc/private_key_modal.html index 5ab5400c3..0e1e6219a 100644 --- a/netbox/templates/secrets/inc/private_key_modal.html +++ b/netbox/templates/secrets/inc/private_key_modal.html @@ -17,7 +17,10 @@
- +
diff --git a/netbox/templates/utilities/confirm_bulk_delete.html b/netbox/templates/utilities/confirm_bulk_delete.html index 49fb975a3..97b9cd277 100644 --- a/netbox/templates/utilities/confirm_bulk_delete.html +++ b/netbox/templates/utilities/confirm_bulk_delete.html @@ -5,11 +5,15 @@ {% block message %}

- Are you sure you want to delete these {{ obj_type_plural|default:"objects" }}? + Are you sure you want to delete these {{ obj_type_plural|default:"objects" }}{% if parent_obj %} from {{ parent_obj }}{% endif %}?

    {% for obj in selected_objects %} -
  • {{ obj }}
    • + {% if obj.get_absolute_url %} +
  • {{ obj }}
    • + {% else %} +
  • {{ obj }}
    • + {% endif %} {% endfor %}
{% endblock %} diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py index 29f2de7cf..1ea23dfd2 100644 --- a/netbox/utilities/views.py +++ b/netbox/utilities/views.py @@ -3,9 +3,11 @@ from django_tables2 import RequestConfig from django.contrib import messages from django.contrib.admin.views.decorators import staff_member_required from django.contrib.contenttypes.models import ContentType +from django.core.exceptions import ImproperlyConfigured from django.core.urlresolvers import reverse from django.db import transaction, IntegrityError from django.db.models import ProtectedError +from django.forms import ModelMultipleChoiceField, MultipleHiddenInput from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import get_object_or_404, redirect, render from django.template import TemplateSyntaxError @@ -309,6 +311,7 @@ class BulkEditView(View): class BulkDeleteView(View): cls = None + parent_cls = None form = None template_name = 'utilities/confirm_bulk_delete.html' default_redirect_url = None @@ -317,24 +320,35 @@ class BulkDeleteView(View): def dispatch(self, *args, **kwargs): return super(BulkDeleteView, self).dispatch(*args, **kwargs) - def get(self, request, *args, **kwargs): - return redirect(self.default_redirect_url) - def post(self, request, *args, **kwargs): + # Attempt to derive parent object if a parent class has been given + if self.parent_cls: + parent_obj = get_object_or_404(self.parent_cls, **kwargs) + else: + parent_obj = None + + # Determine URL to redirect users upon deletion of objects posted_redirect_url = request.POST.get('redirect_url') if posted_redirect_url and is_safe_url(url=posted_redirect_url, host=request.get_host()): redirect_url = posted_redirect_url - else: + elif parent_obj: + redirect_url = parent_obj.get_absolute_url() + elif self.default_redirect_url: redirect_url = reverse(self.default_redirect_url) + else: + raise ImproperlyConfigured('No redirect URL has been provided.') + # Are we deleting *all* objects in the queryset or just a selected subset? if request.POST.get('_all'): pk_list = [x for x in request.POST.get('pk_all').split(',') if x] else: pk_list = request.POST.getlist('pk') + form_cls = self.get_form() + if '_confirm' in request.POST: - form = self.form(request.POST) + form = form_cls(request.POST) if form.is_valid(): # Delete objects @@ -351,7 +365,7 @@ class BulkDeleteView(View): return redirect(redirect_url) else: - form = self.form(initial={'pk': pk_list}) + form = form_cls(initial={'pk': pk_list}) selected_objects = self.cls.objects.filter(pk__in=pk_list) if not selected_objects: @@ -360,7 +374,18 @@ class BulkDeleteView(View): return render(request, self.template_name, { 'form': form, + 'parent_obj': parent_obj, 'obj_type_plural': self.cls._meta.verbose_name_plural, 'selected_objects': selected_objects, 'cancel_url': redirect_url, }) + + def get_form(self): + """Provide a standard bulk delete form if none has been specified for the view""" + + class BulkDeleteForm(ConfirmationForm): + pk = ModelMultipleChoiceField(queryset=self.cls.objects.all(), widget=MultipleHiddenInput) + + if self.form: + return self.form + return BulkDeleteForm