diff --git a/rowers/admin.py b/rowers/admin.py index 47f56a78..6166b1d2 100644 --- a/rowers/admin.py +++ b/rowers/admin.py @@ -8,7 +8,7 @@ from .models import ( WorkoutComment, C2WorldClassAgePerformance, PlannedSession, GeoCourse, GeoPolygon, GeoPoint, VirtualRace, VirtualRaceResult, PaidPlan, IndoorVirtualRaceResult, ShareKey, - CourseStandard, StandardCollection, InstantPlan, + CourseStandard, StandardCollection, InstantPlan, UserMessage ) # Register your models here so you can use them in the Admin module @@ -170,6 +170,9 @@ class CourseStandardAdmin(admin.ModelAdmin): class InstantPlanAdmin(admin.ModelAdmin): list_display = ('name','duration','price') +class UserMessageAdmin(admin.ModelAdmin): + list_display = ('receiver','datetime','subject') + admin.site.unregister(User) admin.site.register(User, UserAdmin) admin.site.register(Workout, WorkoutAdmin) @@ -192,3 +195,4 @@ admin.site.register(ShareKey, ShareKeyAdmin) admin.site.register(CourseStandard, CourseStandardAdmin) admin.site.register(StandardCollection, StandardCollectionAdmin) admin.site.register(InstantPlan, InstantPlanAdmin) +admin.site.register(UserMessage, UserMessageAdmin) diff --git a/rowers/models.py b/rowers/models.py index 1d411f41..4433bd5c 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -1247,6 +1247,14 @@ class UserMessage(models.Model): isread = models.BooleanField(default=False) text = models.CharField(max_length=1000) subject = models.CharField(max_length=100,default='Message') + + def __str__(self): + return '{r1} {r2} {d} {subject}'.format( + r1 = self.receiver.user.first_name, + r2 = self.receiver.user.last_name, + d = self.datetime, + subject = self.subject + ) # requestor is user diff --git a/rowers/templates/.#analysis.html b/rowers/templates/.#analysis.html new file mode 120000 index 00000000..874cf7e6 --- /dev/null +++ b/rowers/templates/.#analysis.html @@ -0,0 +1 @@ +sander@rowsandall-2.6250:1697974899 \ No newline at end of file diff --git a/rowers/templates/menu_profile.html b/rowers/templates/menu_profile.html index 0beb4987..dd93df61 100644 --- a/rowers/templates/menu_profile.html +++ b/rowers/templates/menu_profile.html @@ -2,6 +2,11 @@ {% load rowerfilters %}