Skip to content
Browse files

Merge branch 'master' into ipset

  • Loading branch information...
2 parents cb14027 + 31fccdd commit 6beeb1d2f761cc9e018fcd4d66cd208537c962bb @micolous committed Oct 27, 2012
Showing with 11 additions and 2 deletions.
  1. +2 −2 tollgate/frontend/views.py
  2. +9 −0 tollgate/scripts/management/commands/scraper.dat
View
4 tollgate/frontend/views.py
@@ -850,7 +850,7 @@ def usage_disable(request, aid):
def pclist(request):
hosts = NetworkHost.objects.exclude(
user_profile__exact=None
- ).order_by('ip_address')
+ ).order_by('user_profile__user__username')
return render_to_response('frontend/pclist.html', {
'hosts': hosts,
@@ -862,7 +862,7 @@ def pclist(request):
def pclist_unowned(request):
hosts = NetworkHost.objects.filter(
user_profile__exact=None
- ).order_by('ip_address')
+ ).order_by('user_profile__user__username')
return render_to_response('frontend/pclist.html', {
'hosts': hosts,
View
9 tollgate/scripts/management/commands/scraper.dat
@@ -106,6 +106,15 @@ quanta = ^quanta
seagate = ^seagate
telco = ^telco systems
zyxel = ^zyxel
+vivotek = ^vivotek
+areca = ^areca
+virtualbox = ^cadmus computer systems
+azurewave = ^azurewave tech
+raspberrypi = ^raspberry pi
+sparklan = ^sparklan communications
+clipsal = ^clipsal
+
+
[oui-console]
; could this be a console?

0 comments on commit 6beeb1d

Please sign in to comment.
Something went wrong with that request. Please try again.