From 88400e286a25d329e25f67c61085aee48f73a6b9 Mon Sep 17 00:00:00 2001
From: Leonidas Poulopoulos <leopoul@noc.grnet.gr>
Date: Tue, 24 Jan 2012 08:59:11 +0200
Subject: [PATCH] Another admin file cleanup. Moved user profile into new file
under accounts
---
accounts/admin.py | 10 ++++++++++
flowspec/admin.py | 2 --
2 files changed, 10 insertions(+), 2 deletions(-)
create mode 100644 accounts/admin.py
diff --git a/accounts/admin.py b/accounts/admin.py
new file mode 100644
index 00000000..c03dbab2
--- /dev/null
+++ b/accounts/admin.py
@@ -0,0 +1,10 @@
+from django.contrib import admin
+from flowspy.accounts.models import *
+from django.contrib.auth.models import User
+from flowspy.peers.models import *
+from django.conf import settings
+
+class UserPrAdmin(admin.ModelAdmin):
+ list_display = ('user', 'peer')
+
+admin.site.register(UserProfile, UserPrAdmin)
\ No newline at end of file
diff --git a/flowspec/admin.py b/flowspec/admin.py
index 03f61276..f89064c0 100644
--- a/flowspec/admin.py
+++ b/flowspec/admin.py
@@ -5,7 +5,6 @@ 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 flowspy.accounts.models import UserProfile
from flowspy.peers.models import *
from flowspy.flowspec.forms import *
import datetime
@@ -76,7 +75,6 @@ class UserProfileAdmin(UserAdmin):
admin.site.unregister(User)
admin.site.register(MatchPort)
admin.site.register(MatchDscp)
-admin.site.register(UserProfile)
admin.site.register(ThenAction)
admin.site.register(Route, RouteAdmin)
admin.site.register(User, UserProfileAdmin)
--
GitLab