From 8ee083f7c118f70b6c5f4dcb21b40c23304a141f Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 21 Jul 2016 10:47:38 -0400 Subject: [PATCH] Fixed Unicode support in forms --- netbox/circuits/forms.py | 6 +++--- netbox/dcim/forms.py | 22 +++++++++++----------- netbox/ipam/forms.py | 18 +++++++++--------- netbox/secrets/forms.py | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/netbox/circuits/forms.py b/netbox/circuits/forms.py index 847402c7d..bfceb287a 100644 --- a/netbox/circuits/forms.py +++ b/netbox/circuits/forms.py @@ -197,17 +197,17 @@ class CircuitBulkDeleteForm(ConfirmationForm): def circuit_type_choices(): type_choices = CircuitType.objects.annotate(circuit_count=Count('circuits')) - return [(t.slug, '{} ({})'.format(t.name, t.circuit_count)) for t in type_choices] + return [(t.slug, u'{} ({})'.format(t.name, t.circuit_count)) for t in type_choices] def circuit_provider_choices(): provider_choices = Provider.objects.annotate(circuit_count=Count('circuits')) - return [(p.slug, '{} ({})'.format(p.name, p.circuit_count)) for p in provider_choices] + return [(p.slug, u'{} ({})'.format(p.name, p.circuit_count)) for p in provider_choices] def circuit_site_choices(): site_choices = Site.objects.annotate(circuit_count=Count('circuits')) - return [(s.slug, '{} ({})'.format(s.name, s.circuit_count)) for s in site_choices] + return [(s.slug, u'{} ({})'.format(s.name, s.circuit_count)) for s in site_choices] class CircuitFilterForm(forms.Form, BootstrapMixin): diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index c8f7eca3f..43497b85c 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -91,7 +91,7 @@ class RackGroupBulkDeleteForm(ConfirmationForm): def rackgroup_site_choices(): site_choices = Site.objects.annotate(rack_count=Count('rack_groups')) - return [(s.slug, '{} ({})'.format(s.name, s.rack_count)) for s in site_choices] + return [(s.slug, u'{} ({})'.format(s.name, s.rack_count)) for s in site_choices] class RackGroupFilterForm(forms.Form, BootstrapMixin): @@ -175,12 +175,12 @@ class RackBulkDeleteForm(ConfirmationForm): def rack_site_choices(): site_choices = Site.objects.annotate(rack_count=Count('racks')) - return [(s.slug, '{} ({})'.format(s.name, s.rack_count)) for s in site_choices] + return [(s.slug, u'{} ({})'.format(s.name, s.rack_count)) for s in site_choices] def rack_group_choices(): group_choices = RackGroup.objects.select_related('site').annotate(rack_count=Count('racks')) - return [(g.pk, '{} ({})'.format(g, g.rack_count)) for g in group_choices] + return [(g.pk, u'{} ({})'.format(g, g.rack_count)) for g in group_choices] class RackFilterForm(forms.Form, BootstrapMixin): @@ -231,7 +231,7 @@ class DeviceTypeBulkDeleteForm(ConfirmationForm): def devicetype_manufacturer_choices(): manufacturer_choices = Manufacturer.objects.annotate(devicetype_count=Count('device_types')) - return [(m.slug, '{} ({})'.format(m.name, m.devicetype_count)) for m in manufacturer_choices] + return [(m.slug, u'{} ({})'.format(m.name, m.devicetype_count)) for m in manufacturer_choices] class DeviceTypeFilterForm(forms.Form, BootstrapMixin): @@ -373,10 +373,10 @@ class DeviceForm(forms.ModelForm, BootstrapMixin): for family in [4, 6]: ip_choices = [] interface_ips = IPAddress.objects.filter(family=family, interface__device=self.instance) - ip_choices += [(ip.id, '{} ({})'.format(ip.address, ip.interface)) for ip in interface_ips] + ip_choices += [(ip.id, u'{} ({})'.format(ip.address, ip.interface)) for ip in interface_ips] nat_ips = IPAddress.objects.filter(family=family, nat_inside__interface__device=self.instance)\ .select_related('nat_inside__interface') - ip_choices += [(ip.id, '{} ({} NAT)'.format(ip.address, ip.nat_inside.interface)) for ip in nat_ips] + ip_choices += [(ip.id, u'{} ({} NAT)'.format(ip.address, ip.nat_inside.interface)) for ip in nat_ips] self.fields['primary_ip{}'.format(family)].choices = [(None, '---------')] + ip_choices else: @@ -548,27 +548,27 @@ class DeviceBulkDeleteForm(ConfirmationForm): def device_site_choices(): site_choices = Site.objects.annotate(device_count=Count('racks__devices')) - return [(s.slug, '{} ({})'.format(s.name, s.device_count)) for s in site_choices] + return [(s.slug, u'{} ({})'.format(s.name, s.device_count)) for s in site_choices] def device_rack_group_choices(): group_choices = RackGroup.objects.select_related('site').annotate(device_count=Count('racks__devices')) - return [(g.pk, '{} ({})'.format(g, g.device_count)) for g in group_choices] + return [(g.pk, u'{} ({})'.format(g, g.device_count)) for g in group_choices] def device_role_choices(): role_choices = DeviceRole.objects.annotate(device_count=Count('devices')) - return [(r.slug, '{} ({})'.format(r.name, r.device_count)) for r in role_choices] + return [(r.slug, u'{} ({})'.format(r.name, r.device_count)) for r in role_choices] def device_type_choices(): type_choices = DeviceType.objects.select_related('manufacturer').annotate(device_count=Count('instances')) - return [(t.pk, '{} ({})'.format(t, t.device_count)) for t in type_choices] + return [(t.pk, u'{} ({})'.format(t, t.device_count)) for t in type_choices] def device_platform_choices(): platform_choices = Platform.objects.annotate(device_count=Count('devices')) - return [(p.slug, '{} ({})'.format(p.name, p.device_count)) for p in platform_choices] + return [(p.slug, u'{} ({})'.format(p.name, p.device_count)) for p in platform_choices] class DeviceFilterForm(forms.Form, BootstrapMixin): diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py index 5c0c7805f..f542f9bdd 100644 --- a/netbox/ipam/forms.py +++ b/netbox/ipam/forms.py @@ -112,7 +112,7 @@ class AggregateBulkDeleteForm(ConfirmationForm): def aggregate_rir_choices(): rir_choices = RIR.objects.annotate(aggregate_count=Count('aggregates')) - return [(r.slug, '{} ({})'.format(r.name, r.aggregate_count)) for r in rir_choices] + return [(r.slug, u'{} ({})'.format(r.name, r.aggregate_count)) for r in rir_choices] class AggregateFilterForm(forms.Form, BootstrapMixin): @@ -266,19 +266,19 @@ def prefix_vrf_choices(): def prefix_site_choices(): site_choices = Site.objects.annotate(prefix_count=Count('prefixes')) - return [(s.slug, '{} ({})'.format(s.name, s.prefix_count)) for s in site_choices] + return [(s.slug, u'{} ({})'.format(s.name, s.prefix_count)) for s in site_choices] def prefix_status_choices(): status_counts = {} for status in Prefix.objects.values('status').annotate(count=Count('status')).order_by('status'): status_counts[status['status']] = status['count'] - return [(s[0], '{} ({})'.format(s[1], status_counts.get(s[0], 0))) for s in PREFIX_STATUS_CHOICES] + return [(s[0], u'{} ({})'.format(s[1], status_counts.get(s[0], 0))) for s in PREFIX_STATUS_CHOICES] def prefix_role_choices(): role_choices = Role.objects.annotate(prefix_count=Count('prefixes')) - return [(r.slug, '{} ({})'.format(r.name, r.prefix_count)) for r in role_choices] + return [(r.slug, u'{} ({})'.format(r.name, r.prefix_count)) for r in role_choices] class PrefixFilterForm(forms.Form, BootstrapMixin): @@ -455,7 +455,7 @@ class VLANGroupBulkDeleteForm(ConfirmationForm): def vlangroup_site_choices(): site_choices = Site.objects.annotate(vlangroup_count=Count('vlan_groups')) - return [(s.slug, '{} ({})'.format(s.name, s.vlangroup_count)) for s in site_choices] + return [(s.slug, u'{} ({})'.format(s.name, s.vlangroup_count)) for s in site_choices] class VLANGroupFilterForm(forms.Form, BootstrapMixin): @@ -540,24 +540,24 @@ class VLANBulkDeleteForm(ConfirmationForm): def vlan_site_choices(): site_choices = Site.objects.annotate(vlan_count=Count('vlans')) - return [(s.slug, '{} ({})'.format(s.name, s.vlan_count)) for s in site_choices] + return [(s.slug, u'{} ({})'.format(s.name, s.vlan_count)) for s in site_choices] def vlan_group_choices(): group_choices = VLANGroup.objects.select_related('site').annotate(vlan_count=Count('vlans')) - return [(g.pk, '{} ({})'.format(g, g.vlan_count)) for g in group_choices] + return [(g.pk, u'{} ({})'.format(g, g.vlan_count)) for g in group_choices] def vlan_status_choices(): status_counts = {} for status in VLAN.objects.values('status').annotate(count=Count('status')).order_by('status'): status_counts[status['status']] = status['count'] - return [(s[0], '{} ({})'.format(s[1], status_counts.get(s[0], 0))) for s in VLAN_STATUS_CHOICES] + return [(s[0], u'{} ({})'.format(s[1], status_counts.get(s[0], 0))) for s in VLAN_STATUS_CHOICES] def vlan_role_choices(): role_choices = Role.objects.annotate(vlan_count=Count('vlans')) - return [(r.slug, '{} ({})'.format(r.name, r.vlan_count)) for r in role_choices] + return [(r.slug, u'{} ({})'.format(r.name, r.vlan_count)) for r in role_choices] class VLANFilterForm(forms.Form, BootstrapMixin): diff --git a/netbox/secrets/forms.py b/netbox/secrets/forms.py index dfa3102f4..95f281502 100644 --- a/netbox/secrets/forms.py +++ b/netbox/secrets/forms.py @@ -103,7 +103,7 @@ class SecretBulkDeleteForm(ConfirmationForm): def secret_role_choices(): role_choices = SecretRole.objects.annotate(secret_count=Count('secrets')) - return [(r.slug, '{} ({})'.format(r.name, r.secret_count)) for r in role_choices] + return [(r.slug, u'{} ({})'.format(r.name, r.secret_count)) for r in role_choices] class SecretFilterForm(forms.Form, BootstrapMixin):