From dc9b0d592132435d6f32d670b0e9b60b219cc3e2 Mon Sep 17 00:00:00 2001
From: Leonidas Poulopoulos <leopoul@noc.grnet.gr>
Date: Tue, 24 Jan 2012 08:52:00 +0200
Subject: [PATCH] Admin files cleanup and reordering
---
flowspec/admin.py | 28 +---------------------------
peers/admin.py | 24 ++++++++++++++++++++++++
peers/models.py | 1 +
3 files changed, 26 insertions(+), 27 deletions(-)
create mode 100644 peers/admin.py
diff --git a/flowspec/admin.py b/flowspec/admin.py
index 548994da..03f61276 100644
--- a/flowspec/admin.py
+++ b/flowspec/admin.py
@@ -10,21 +10,6 @@ from flowspy.peers.models import *
from flowspy.flowspec.forms import *
import datetime
from django.conf import settings
-from django.forms import ModelForm
-from django.contrib.admin.widgets import FilteredSelectMultiple
-
-class PeerAdminForm(ModelForm):
- networks=forms.ModelMultipleChoiceField(PeerRange.objects.all(),widget=
- FilteredSelectMultiple("PeerRange",True), required=False)
-
- class Meta:
- model= Peer
-
-class PeerAdmin(admin.ModelAdmin):
- form = PeerAdminForm
-
-class PeerTechcAdmin(admin.ModelAdmin):
- list_display = ('get_peer_name', 'emails')
class RouteAdmin(admin.ModelAdmin):
form = RouteForm
@@ -66,7 +51,7 @@ class UserProfileInline(admin.StackedInline):
class UserProfileAdmin(UserAdmin):
actions = ['deactivate', 'activate']
- list_display = ('username', 'email', 'first_name' , 'last_name', 'is_staff', 'is_active','get_userprofile_peer')
+ list_display = ('username', 'email', 'first_name' , 'last_name', 'is_staff', 'is_active', 'is_superuser', 'get_userprofile_peer')
inlines = [UserProfileInline]
def deactivate(self, request, queryset):
@@ -88,22 +73,11 @@ class UserProfileAdmin(UserAdmin):
# kwargs['widget'] = PasswordInput
# return db_field.formfield(**kwargs)
-#admin.site.register(MatchAddress)
admin.site.unregister(User)
admin.site.register(MatchPort)
admin.site.register(MatchDscp)
admin.site.register(UserProfile)
-#admin.site.register(MatchFragmentType)
-#admin.site.register(MatchIcmpCode)
-#admin.site.register(MatchIcmpType)
-#admin.site.register(MatchPacketLength)
-#admin.site.register(MatchProtocol)
-#admin.site.register(MatchTcpFlag)
admin.site.register(ThenAction)
-#admin.site.register(ThenStatement)
-#admin.site.register(MatchStatement)
-admin.site.register(Peer, PeerAdmin)
-admin.site.register(PeerTechc, PeerTechcAdmin)
admin.site.register(Route, RouteAdmin)
admin.site.register(User, UserProfileAdmin)
admin.site.disable_action('delete_selected')
diff --git a/peers/admin.py b/peers/admin.py
new file mode 100644
index 00000000..2fe8069f
--- /dev/null
+++ b/peers/admin.py
@@ -0,0 +1,24 @@
+from django.contrib import admin
+
+from flowspy.peers.models import *
+from flowspy.flowspec.forms import *
+from django.conf import settings
+from django.forms import ModelForm
+from django.contrib.admin.widgets import FilteredSelectMultiple
+
+class PeerAdminForm(ModelForm):
+ networks=forms.ModelMultipleChoiceField(PeerRange.objects.all(),widget=
+ FilteredSelectMultiple("PeerRange",True), required=False)
+
+ class Meta:
+ model= Peer
+
+class PeerAdmin(admin.ModelAdmin):
+ form = PeerAdminForm
+
+class PeerTechcAdmin(admin.ModelAdmin):
+ list_display = ('get_peer_name', 'emails')
+
+admin.site.register(Peer, PeerAdmin)
+admin.site.register(PeerTechc, PeerTechcAdmin)
+admin.site.register(PeerRange)
\ No newline at end of file
diff --git a/peers/models.py b/peers/models.py
index 311c408d..405a8038 100644
--- a/peers/models.py
+++ b/peers/models.py
@@ -9,6 +9,7 @@ class PeerRange(models.Model):
return self.network
class Meta:
db_table = u'peer_range'
+ ordering = ['network']
# Create your models here.
class Peer(models.Model):
--
GitLab