From 9266e6b67afdd2c8cda3de95748c62375a517e3e Mon Sep 17 00:00:00 2001 From: Scott Baker Date: Sun, 19 May 2013 15:54:48 -0700 Subject: [PATCH] add timezone field to user --- planetstack/core/admin.py | 2 +- planetstack/core/models/user.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py index 0329cd6..85bed74 100644 --- a/planetstack/core/admin.py +++ b/planetstack/core/admin.py @@ -424,7 +424,7 @@ class UserAdmin(UserAdmin, OSModelAdmin): list_filter = ('site',) inlines = [SitePrivilegeInline, SliceMembershipInline] fieldsets = ( - (None, {'fields': ('email', 'password', 'site', 'is_admin')}), + (None, {'fields': ('email', 'password', 'site', 'is_admin', 'timezone')}), ('Personal info', {'fields': ('firstname','lastname','phone', 'key')}), #('Important dates', {'fields': ('last_login',)}), ) diff --git a/planetstack/core/models/user.py b/planetstack/core/models/user.py index e6c42e7..055b6cd 100644 --- a/planetstack/core/models/user.py +++ b/planetstack/core/models/user.py @@ -6,6 +6,7 @@ from core.models import PlCoreBase from core.models import Site from core.models import Key from django.contrib.auth.models import AbstractBaseUser, BaseUserManager +from timezones.fields import TimeZoneField # Create your models here. class UserManager(BaseUserManager): @@ -68,6 +69,8 @@ class User(AbstractBaseUser): is_admin = models.BooleanField(default=True) is_staff = models.BooleanField(default=True) + timezone = TimeZoneField() + objects = UserManager() USERNAME_FIELD = 'email' @@ -95,8 +98,8 @@ class User(AbstractBaseUser): return True def get_roles(self): - from plstackapi.core.models.site import SitePrivilege - from plstackapi.core.models.slice import SliceMembership + from core.models.site import SitePrivilege + from core.models.slice import SliceMembership site_privileges = SitePrivilege.objects.filter(user=self) slice_memberships = SliceMembership.objects.filter(user=self) -- 2.43.0