more merge

1 files changed, 7 insertions, 10 deletions

diff --git a/main/models.py b/main/models.py
index 8858b17b..ff2ecf02 100644
--- a/main/models.py
+++ b/main/models.py
@@ -2,18 +2,23 @@ from django.db import models
 from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
 
-from main.utils import cache_function
+from main.utils import cache_function, make_choice
 from packages.models import PackageRelation
 
 from itertools import groupby
+import pytz
 from operator import attrgetter
 
 class UserProfile(models.Model):
-    id = models.AutoField(primary_key=True) # not technically needed
     notify = models.BooleanField(
         "Send notifications",
         default=True,
         help_text="When enabled, send user 'flag out-of-date' notifications")
+    time_zone = models.CharField(
+        max_length=100,
+        choices=make_choice(pytz.common_timezones),
+        default="UTC",
+        help_text="Used for developer clock page")
     alias = models.CharField(
         max_length=50,
         help_text="Required field")
@@ -49,7 +54,6 @@ class PackageManager(models.Manager):
 
 
 class Donor(models.Model):
-    id = models.AutoField(primary_key=True)
     name = models.CharField(max_length=255, unique=True)
     visible = models.BooleanField(default=True,
             help_text="Should we show this donor on the public page?")
@@ -62,7 +66,6 @@ class Donor(models.Model):
         ordering = ['name']
 
 class Arch(models.Model):
-    id = models.AutoField(primary_key=True)
     name = models.CharField(max_length=255, unique=True)
     agnostic = models.BooleanField(default=False,
             help_text="Is this architecture non-platform specific?")
@@ -79,7 +82,6 @@ class Arch(models.Model):
         verbose_name_plural = 'arches'
 
 class Repo(models.Model):
-    id = models.AutoField(primary_key=True)
     name = models.CharField(max_length=255, unique=True)
     testing = models.BooleanField(default=False,
             help_text="Is this repo meant for package testing?")
@@ -100,7 +102,6 @@ class Repo(models.Model):
         verbose_name_plural = 'repos'
 
 class Package(models.Model):
-    id = models.AutoField(primary_key=True)
     repo = models.ForeignKey(Repo, related_name="packages")
     arch = models.ForeignKey(Arch, related_name="packages")
     pkgname = models.CharField(max_length=255, db_index=True)
@@ -308,14 +309,12 @@ class Signoff(models.Model):
     packager = models.ForeignKey(User)
 
 class PackageFile(models.Model):
-    id = models.AutoField(primary_key=True)
     pkg = models.ForeignKey('Package')
     path = models.CharField(max_length=255)
     class Meta:
         db_table = 'package_files'
 
 class PackageDepend(models.Model):
-    id = models.AutoField(primary_key=True)
     pkg = models.ForeignKey('Package')
     depname = models.CharField(db_index=True, max_length=255)
     depvcmp = models.CharField(max_length=255)
@@ -323,7 +322,6 @@ class PackageDepend(models.Model):
         db_table = 'package_depends'
 
 class Todolist(models.Model):
-    id = models.AutoField(primary_key=True)
     creator = models.ForeignKey(User)
     name = models.CharField(max_length=255)
     description = models.TextField()
@@ -351,7 +349,6 @@ class Todolist(models.Model):
         return '/todo/%i/' % self.id
 
 class TodolistPkg(models.Model):
-    id = models.AutoField(primary_key=True)
     list = models.ForeignKey('Todolist')
     pkg = models.ForeignKey('Package')
     complete = models.BooleanField(default=False)