8000 moved away from auto_now on advice from http://stackoverflow.com/ques… · ptarjan/python-oauth@b3a196e · GitHub
[go: up one dir, main page]
Skip to content

Commit b3a196e

Browse files
ptarjanptarjan
committed
1 parent f95e813 commit b3a196e

File tree

1 file changed

+25
-13
lines changed

1 file changed

+25
-13
lines changed

‎oauth/db/django_model/models.py‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import oauth
22
import logging
3+
from datetime import datetime
34

45
from django.db import models
56
class Token(models.Model):
@@ -28,8 +29,14 @@ def makeToken(self):
2829
def __unicode__(self):
2930
return "%s %s..." % (self.type, self.token[:10])
3031

31-
created = models.DateTimeField(auto_now_add=True)
32-
modified = models.DateTimeField(auto_now=True)
32+
created = models.DateTimeField()
33+
modified = models.DateTimeField()
34+
def save(self, *args, **kwargs):
35+
''' On save, update timestamps '''
36+
if not self.id:
37+
self.created = datetime.now()
38+
self.modified = datetime.now()
39+
return super(Token, self).save(*args, **kwargs)
3340

3441

3542
class User(models.Model):
@@ -80,15 +87,6 @@ def get_from_key(key):
8087
return r
8188
raise Exception("Can't find object with key: %s" % key)
8289

83-
def save(self):
84-
"""Save this to the DB"""
85-
if not self.primary_key:
86-
import string
87-
import random
88-
chars = string.letters + string.digits
89-
self.primary_key = ''.join(random.sample(chars, 20))
90-
logging.info("new user (%s): %s" % (self.type, self.primary_key))
91-
return super(User, self).save()
9290
def delete(self):
9391
if self.request_token:
9492
self.request_token.delete()
@@ -99,5 +97,19 @@ def delete(self):
9997
def __unicode__(self):
10098
return "%s %s" % (self.type, self.primary_key)
10199

102-
created = models.DateTimeField(auto_now_add=True)
103-
modified = models.DateTimeField(auto_now=True)
100+
created = models.DateTimeField()
101+
modified = models.DateTimeField()
102+
103+
def save(self, *args, **kwargs):
104+
if not self.primary_key:
105+
import string
106+
import random
107+
chars = string.letters + string.digits
108+
self.primary_key = ''.join(random.sample(chars, 20))
109+
logging.info("new user (%s): %s" % (self.type, self.primary_key))
110+
111+
if not self.id:
112+
self.created = datetime.now()
113+
self.modified = datetime.now()
114+
115+
return super(User, self).save(*args, **kwargs)

0 commit comments

Comments
 (0)
0