Merge d4e6717 into edc610a

allegro · Jun 12, 2014 · 3dc971a · 3dc971a
2 parents edc610a + d4e6717
commit 3dc971a
Show file tree

Hide file tree

Showing 4 changed files with 1,418 additions and 2 deletions.
diff --git a/src/ralph/discovery/admin.py b/src/ralph/discovery/admin.py
@@ -57,11 +57,26 @@ def copy_network(modeladmin, request, queryset):
 
 class NetworkAdmin(ModelAdmin):
 
+    def address(self):
+        return self.address
+
+    address.short_description = _("network address")
+    address.admin_order_field = 'min_ip'
+
+    def gateway(self):
+        return self.gateway
+
+    gateway.short_description = _("gateway address")
+    gateway.admin_order_field = 'gateway_as_int'
+
     def terms(self):
         return ", ".join([n.name for n in self.terminators.order_by('name')])
+
     terms.short_description = _("network terminators")
-    list_display = ('name', 'vlan', 'address', 'gateway', terms,
-                    'data_center', 'environment', 'kind')
+
+    list_display = ('name', 'vlan', address, gateway, terms, 'data_center',
+                    'environment', 'kind')
+
     list_filter = (
         'data_center', 'terminators', 'environment', 'kind', 'dhcp_broadcast',
     )