No help for now.

[patchwork] / apps / patchwork / models.py

diff --git a/apps/patchwork/models.py b/apps/patchwork/models.py
index f6943fc5296553ff10050b8925fd563175d276e4..e3fc9c7e1f7b068e0bb176c8d83ac35fb8d1873a 100644 (file)
--- a/apps/patchwork/models.py
+++ b/apps/patchwork/models.py
@@ -50,9 +50,6 @@ class Person(models.Model):
     class Meta:
         verbose_name_plural = 'People'
 
-    class Admin:
-        pass
-
 class Project(models.Model):
     linkname = models.CharField(max_length=255, unique=True)
     name = models.CharField(max_length=255, unique=True)
@@ -62,9 +59,6 @@ class Project(models.Model):
     def __str__(self):
         return self.name
 
-    class Admin:
-        pass
-
 class UserProfile(models.Model):
     user = models.ForeignKey(User, unique = True)
     primary_project = models.ForeignKey(Project, null = True)
@@ -125,9 +119,6 @@ class UserProfile(models.Model):
                 person.user = self.user
                 person.save()
 
-    class Admin:
-        pass
-
     def __str__(self):
         return self.name()
 
@@ -145,8 +136,12 @@ class RegistrationRequest(models.Model):
     email = models.CharField(max_length = 200, unique = True)
     password = models.CharField(max_length = 200)
     key = models.CharField(max_length = 32, default = _confirm_key)
+    date = models.DateTimeField(default=datetime.datetime.now)
+    active = models.BooleanField(default = True)
 
     def create_user(self):
+       if not self.active:
+           return
         user = User.objects.create_user(self.username,
                 self.email, self.password)
         user.first_name = self.first_name
@@ -154,7 +149,8 @@ class RegistrationRequest(models.Model):
         user.save()
         profile = UserProfile(user = user)
         profile.save()
-        self.delete()
+        self.active = False
+       self.save()
 
         # link a person to this user. if none exists, create.
         person = None
@@ -170,16 +166,16 @@ class RegistrationRequest(models.Model):
 
         return user
 
-    class Admin:
-        pass
-
 class UserPersonConfirmation(models.Model):
     user = models.ForeignKey(User)
     email = models.CharField(max_length = 200)
-    date = models.DateTimeField(default=datetime.datetime.now)
     key = models.CharField(max_length = 32, default = _confirm_key)
+    date = models.DateTimeField(default=datetime.datetime.now)
+    active = models.BooleanField(default = True)
 
     def confirm(self):
+       if not self.active:
+           return
         person = None
         try:
             person = Person.objects.get(email = self.email)
@@ -190,11 +186,7 @@ class UserPersonConfirmation(models.Model):
 
         person.link_to_user(self.user)
         person.save()
-
-
-    class Admin:
-        pass
-
+        self.active = False
 
 class State(models.Model):
     name = models.CharField(max_length = 100)
@@ -207,9 +199,6 @@ class State(models.Model):
     class Meta:
         ordering = ['ordering']
 
-    class Admin:
-        pass
-
 class HashField(models.Field):
     __metaclass__ = models.SubfieldBase
 
@@ -312,9 +301,6 @@ class Patch(models.Model):
         verbose_name_plural = 'Patches'
         ordering = ['date']
 
-    class Admin:
-        pass
-
 class Comment(models.Model):
     patch = models.ForeignKey(Patch)
     msgid = models.CharField(max_length=255, unique = True)
@@ -323,9 +309,6 @@ class Comment(models.Model):
     headers = models.TextField(blank = True)
     content = models.TextField()
 
-    class Admin:
-        pass
-
     class Meta:
         ordering = ['date']
 
@@ -342,9 +325,6 @@ class Bundle(models.Model):
     class Meta:
         unique_together = [('owner', 'name')]
 
-    class Admin:
-        pass
-
     def public_url(self):
         if not self.public:
             return None