User monkeypatching (longer username) now works for admin as well

[flowspy] / flowspec / admin.py

diff --git a/flowspec/admin.py b/flowspec/admin.py
index 5ee2e91..732f30b 100644 (file)
--- a/flowspec/admin.py
+++ b/flowspec/admin.py
@@ -5,9 +5,12 @@ from utils import proxy as PR
 from flowspec.tasks import *
 from django.contrib.auth.models import User
 from django.contrib.auth.admin import UserAdmin
-from accounts.models import UserProfile
+from flowspy.peers.models import *
 from flowspy.flowspec.forms import *
 import datetime
+from django.conf import settings
+
+from flowspy.monkey_patch.forms import UserCreationForm, UserChangeForm
 
 class RouteAdmin(admin.ModelAdmin):
     form = RouteForm
@@ -21,9 +24,11 @@ class RouteAdmin(admin.ModelAdmin):
 
     def save_model(self, request, obj, form, change):
         obj.status = "PENDING"
-        obj.expires = datetime.date.today()
         obj.save()
-        obj.commit_add()
+        if change:
+            obj.commit_edit()
+        else:
+            obj.commit_add()
 
     def has_delete_permission(self, request, obj=None):
         return False
@@ -35,6 +40,7 @@ class RouteAdmin(admin.ModelAdmin):
         ("Match",               {'fields': ['source', 'sourceport', 'destination', 'destinationport', 'port']}),
         ('Advanced Match Statements', {'fields': ['dscp', 'fragmenttype', 'icmpcode', 'icmptype', 'packetlength', 'protocol', 'tcpflag'], 'classes': ['collapse']}),
         ("Then",               {'fields': ['then' ]}),
+        ("Expires",               {'fields': ['expires' ]}),
         (None,               {'fields': ['comments',]}),
         
     ]
@@ -45,7 +51,24 @@ class UserProfileInline(admin.StackedInline):
     model = UserProfile
     
 class UserProfileAdmin(UserAdmin):
+    add_form = UserCreationForm
+    form = UserChangeForm
+    actions = ['deactivate', 'activate']
+    list_display = ('username', 'email', 'first_name' , 'last_name', 'is_staff', 'is_active', 'is_superuser', 'get_userprofile_peer')
     inlines = [UserProfileInline]
+
+    def deactivate(self, request, queryset):
+        queryset = queryset.update(is_active=False)
+    deactivate.short_description = "Deactivate Selected Users"
+
+    def activate(self, request, queryset):
+        queryset = queryset.update(is_active=True)
+    activate.short_description = "Activate Selected Users"
+
+    def get_userprofile_peer(self, instance):
+        # instance is User instance
+        return instance.get_profile().peer
+    get_userprofile_peer.short_description = "User Peer"
 #    fields = ('name', 'applier', 'expires')
 
     #def formfield_for_dbfield(self, db_field, **kwargs):
@@ -53,20 +76,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(MatchProtocol)
 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(Route, RouteAdmin)
 admin.site.register(User, UserProfileAdmin)
 admin.site.disable_action('delete_selected')