From 97e6ad5d2777003699e266fc80b89e88ce52eda2 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 7 Feb 2017 17:54:47 +0100 Subject: [PATCH] changed Team model --- rowers/admin.py | 10 +++++++++- rowers/models.py | 6 +++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/rowers/admin.py b/rowers/admin.py index 2b156476..c5dd467e 100644 --- a/rowers/admin.py +++ b/rowers/admin.py @@ -2,7 +2,10 @@ from django.contrib import admin from django.contrib.auth.admin import UserAdmin from django.contrib.auth.models import User -from .models import Rower, Workout,GraphImage,FavoriteChart,SiteAnnouncement +from .models import ( + Rower, Workout,GraphImage,FavoriteChart,SiteAnnouncement, + Team, + ) # Register your models here so you can use them in the Admin module @@ -11,6 +14,7 @@ class RowerInline(admin.StackedInline): model = Rower can_delete = False verbose_name_plural = 'rower' + filter_horizontal = ('team','friends') class UserAdmin(UserAdmin): inlines = (RowerInline,) @@ -23,10 +27,14 @@ class FavoriteChartAdmin(admin.ModelAdmin): class SiteAnnouncementAdmin(admin.ModelAdmin): list_display = ('announcement','created','modified','expires','dotweet') + +class TeamAdmin(admin.ModelAdmin): + list_display = ('name',) admin.site.unregister(User) admin.site.register(User,UserAdmin) admin.site.register(Workout,WorkoutAdmin) admin.site.register(GraphImage) +admin.site.register(Team,TeamAdmin) admin.site.register(FavoriteChart,FavoriteChartAdmin) admin.site.register(SiteAnnouncement,SiteAnnouncementAdmin) diff --git a/rowers/models.py b/rowers/models.py index aded5102..29fd5a4e 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -85,6 +85,10 @@ class PowerZonesField(models.TextField): class Team(models.Model): name = models.CharField(max_length=150) notes = models.CharField(blank=True,max_length=200) + manager = models.ForeignKey(User) + + def __unicode__(self): + return self.name # Extension of User with rowing specific data class Rower(models.Model): @@ -149,7 +153,7 @@ class Rower(models.Model): # Friends/Team friends = models.ManyToManyField("self",blank=True) - team = models.ForeignKey(Team,blank=True,null=True) + team = models.ManyToManyField(Team,blank=True) def __str__(self): return self.user.username