Merge pull request #1398 from digitalocean/develop

Release v2.1.2

netbox/dcim/filters.py

@@ -448,20 +448,13 @@ class Meta:
     def search(self, queryset, name, value):
         if not value.strip():
             return queryset
-        qs_filter = (
+        return queryset.filter(
             Q(name__icontains=value) |
             Q(serial__icontains=value.strip()) |
             Q(inventory_items__serial__icontains=value.strip()) |
             Q(asset_tag=value.strip()) |
             Q(comments__icontains=value)
-        )
-        # If the query value looks like a MAC address, search interfaces as well.
-        try:
-            mac = EUI(value.strip())
-            qs_filter |= Q(interfaces__mac_address=mac)
-        except AddrFormatError:
-            pass
-        return queryset.filter(qs_filter).distinct()
+        ).distinct()
 
     def _mac_address(self, queryset, name, value):
         value = value.strip()

netbox/ipam/api/views.py

@@ -115,7 +115,11 @@ def available_ips(self, request, pk=None):
                 limit = min(limit, settings.MAX_PAGE_SIZE)
 
             # Calculate available IPs within the prefix
-            ip_list = list(prefix.get_available_ips())[:limit]
+            ip_list = []
+            for index, ip in enumerate(prefix.get_available_ips(), start=1):
+                ip_list.append(ip)
+                if index == limit:
+                    break
             serializer = serializers.AvailableIPSerializer(ip_list, many=True, context={
                 'request': request,
                 'prefix': prefix.prefix,

netbox/ipam/migrations/0018_remove_service_uniqueness_constraint.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.3 on 2017-08-03 19:37
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ipam', '0017_ipaddress_roles'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='service',
+            unique_together=set([]),
+        ),
+    ]

netbox/ipam/models.py

@@ -600,7 +600,6 @@ class Service(CreatedUpdatedModel):
 
     class Meta:
         ordering = ['device', 'protocol', 'port']
-        unique_together = ['device', 'protocol', 'port']
 
     def __str__(self):
         return '{} ({}/{})'.format(self.name, self.port, self.get_protocol_display())

netbox/netbox/settings.py

@@ -13,7 +13,7 @@
     )
 
 
-VERSION = '2.1.1'
+VERSION = '2.1.2'
 
 # Import required configuration parameters
 ALLOWED_HOSTS = DATABASE = SECRET_KEY = None

netbox/project-static/css/base.css

@@ -81,6 +81,11 @@ footer p {
     }
 }
 
+/* Navigation menu */
+li.subnav > a {
+    padding-left: 30px;
+}
+
 /* Forms */
 label {
     font-weight: normal;