From 9d884c0a2ca7aaef62a9cd665009936c0095fe4b Mon Sep 17 00:00:00 2001 From: Brett Costabile Date: Sun, 24 May 2015 15:32:43 -0400 Subject: [PATCH] More format corrections I forgot to adjust the class names in admin.py after changing the first characters to caps. There was also a little shuffling of code to make the definitions work. --- services/admin.py | 6 +++--- services/models.py | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/services/admin.py b/services/admin.py index 1e8bd590..ce073caa 100644 --- a/services/admin.py +++ b/services/admin.py @@ -1,7 +1,7 @@ from django.contrib import admin -from .models import authTS +from .models import AuthTS from .models import TSgroup -from .models import userTSgroup +from .models import UserTSgroup class AuthTSgroupAdmin(admin.ModelAdmin): fields = ['ts_group_id','auth_group_id'] @@ -9,5 +9,5 @@ class AuthTSgroupAdmin(admin.ModelAdmin): class TSgroupAdmin(admin.ModelAdmin): fields = ['name'] -admin.site.register(authTS, AuthTSgroupAdmin) +admin.site.register(AuthTS, AuthTSgroupAdmin) admin.site.register(TSgroup, TSgroupAdmin) \ No newline at end of file diff --git a/services/models.py b/services/models.py index 03d39d06..843caccf 100644 --- a/services/models.py +++ b/services/models.py @@ -1,13 +1,13 @@ from django.db import models +class TSgroup(models.Model): + group_id = models.IntegerField(primary_key=True) + name = models.CharField(max_length=30) + class AuthTS(models.Model): ts_group_id = models.ForeignKey(TSgroup) - auth_group_id = models.ForeignKey(Group) + auth_group_id = models.ForeignKey('auth.Group') -class TSgroup(models.Model): - group_id = models.int(primary_key=True) - name = models.CharField(max_length=30) - -class UserTSgroup(model.Model): - user_id = models.ForeignKey(User) - group_id = model.ManyToManyField(TSgroup) \ No newline at end of file +class UserTSgroup(models.Model): + user_id = models.ForeignKey('auth.User') + group_id = models.ManyToManyField(TSgroup) \ No newline at end of file