Fix grant script

[patchwork] / apps / patchwork / models.py

diff --git a/apps/patchwork/models.py b/apps/patchwork/models.py
index 22062c2189f468eb20e4b8ad2ff1f9e1a16b3632..bbfe827aec551d41bdc75a8f0dde6315b74a09d5 100644 (file)
--- a/apps/patchwork/models.py
+++ b/apps/patchwork/models.py
@@ -136,13 +136,14 @@ class UserProfile(models.Model):
     def __unicode__(self):
         return self.name()
 
-def _user_created_callback(sender, created, instance, **kwargs):
-    if not created:
-        return
-    profile = UserProfile(user = instance)
+def _user_saved_callback(sender, created, instance, **kwargs):
+    try:
+        profile = instance.get_profile()
+    except UserProfile.DoesNotExist:
+        profile = UserProfile(user = instance)
     profile.save()
 
-models.signals.post_save.connect(_user_created_callback, sender = User)
+models.signals.post_save.connect(_user_saved_callback, sender = User)
 
 class State(models.Model):
     name = models.CharField(max_length = 100)
@@ -179,7 +180,7 @@ class HashField(models.CharField):
         kwargs['max_length'] = self.n_bytes
         super(HashField, self).__init__(*args, **kwargs)
 
-    def db_type(self):
+    def db_type(self, connection=None):
         return 'char(%d)' % self.n_bytes
 
 class PatchMbox(MIMENonMultipart):
@@ -190,6 +191,9 @@ class PatchMbox(MIMENonMultipart):
         self.set_payload(_text.encode(self.patch_charset))
         encode_7or8bit(self)
 
+def get_default_initial_patch_state():
+    return State.objects.get(ordering=0)
+
 class Patch(models.Model):
     project = models.ForeignKey(Project)
     msgid = models.CharField(max_length=255)
@@ -197,7 +201,7 @@ class Patch(models.Model):
     date = models.DateTimeField(default=datetime.datetime.now)
     submitter = models.ForeignKey(Person)
     delegate = models.ForeignKey(User, blank = True, null = True)
-    state = models.ForeignKey(State)
+    state = models.ForeignKey(State, default=get_default_initial_patch_state)
     archived = models.BooleanField(default = False)
     headers = models.TextField(blank = True)
     content = models.TextField(null = True, blank = True)