Updated admin entries, blank profile page

This commit is contained in:
2010-02-25 19:40:04 +00:00
parent e624535779
commit 180b344c72
4 changed files with 19 additions and 9 deletions

1
.gitignore vendored
View File

@@ -1,2 +1,3 @@
*.pyc *.pyc
*~ *~
*.db

View File

@@ -1,13 +1,20 @@
"""
Admin interface models. Automatically detected by admin.autodiscover().
"""
from django.contrib import admin from django.contrib import admin
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.contrib.auth.admin import UserAdmin from django.contrib.auth.admin import UserAdmin
from sso.models import Service, ServiceAccount, SSOUser from sso.models import Service, ServiceAccount, SSOUser
admin.site.register(Service) class ServiceAdmin(admin.ModelAdmin):
admin.site.register(ServiceAccount) list_display = ('name', 'url', 'api', 'active')
search_fields = ['name', 'active']
admin.site.register(Service, ServiceAdmin)
class ServiceAccountAdmin(admin.ModelAdmin):
list_display = ('service', 'username', 'user', 'active')
search_fields = ['service', 'username', 'user', 'active']
admin.site.register(ServiceAccount, ServiceAccountAdmin)
class SSOUserProfileInline(admin.StackedInline): class SSOUserProfileInline(admin.StackedInline):
model = SSOUser model = SSOUser

View File

@@ -25,6 +25,8 @@ class SSOUser(models.Model):
icq = models.CharField(max_length=15, blank=True) icq = models.CharField(max_length=15, blank=True)
xmpp = models.CharField(max_length=200, blank=True) xmpp = models.CharField(max_length=200, blank=True)
corp_user = models.BooleanField()
def __str__(self): def __str__(self):
return self.user.__str__() return self.user.__str__()
@@ -38,8 +40,8 @@ signals.post_save.connect(SSOUser.create_user_profile, sender=User)
class Service(models.Model): class Service(models.Model):
name = models.CharField(max_length=200) name = models.CharField(max_length=200)
url = models.CharField(max_length=200) url = models.CharField(max_length=200, blank=True)
active = models.BooleanField() active = models.BooleanField(default=True)
api = models.CharField(max_length=200) api = models.CharField(max_length=200)
def __str__(self): def __str__(self):
@@ -48,9 +50,9 @@ class Service(models.Model):
class ServiceAccount(models.Model): class ServiceAccount(models.Model):
user = models.ForeignKey(User, blank=False) user = models.ForeignKey(User, blank=False)
service = models.ForeignKey(Service, blank=False) service = models.ForeignKey(Service, blank=False)
username = models.CharField(max_length=200, blank=False) username = models.CharField(max_length=200, blank=True)
password = models.CharField(max_length=200, blank=False) password = models.CharField(max_length=200, blank=False)
active = models.BooleanField() active = models.BooleanField(default=True)
def __str__(self): def __str__(self):
return "%s: %s (%s)" % (self.service.name, self.user.username, self.username) return "%s: %s (%s)" % (self.service.name, self.user.username, self.username)

0
templates/profile.html Normal file
View File