Skip to content

Commit

Permalink
Staticpages: removed implicit auto date behavior
Browse files Browse the repository at this point in the history
On the one hand, there's already `default=now`, which is exactly the same
as `auto_now_add=True`.

On the other hand, this was preventing tests from overriding
`LegalPage.modified_on` and `Agreement.agreed_on`, as the built-in
behavior is implemented via a `pre_save` signal that messes things around
— we better be explicit whenever we want to automatically update
timestamps.

Picked from 7a69135.
  • Loading branch information
unho committed Jun 18, 2015
1 parent ee260a8 commit e50ee88
Show file tree
Hide file tree
Showing 2 changed files with 133 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
# -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models


class Migration(SchemaMigration):

def forwards(self, orm):

# Changing field 'Agreement.agreed_on'
db.alter_column(u'staticpages_agreement', 'agreed_on', self.gf('django.db.models.fields.DateTimeField')())

# Changing field 'StaticPage.modified_on'
db.alter_column(u'staticpages_staticpage', 'modified_on', self.gf('django.db.models.fields.DateTimeField')())

# Changing field 'LegalPage.modified_on'
db.alter_column(u'staticpages_legalpage', 'modified_on', self.gf('django.db.models.fields.DateTimeField')())

def backwards(self, orm):

# Changing field 'Agreement.agreed_on'
db.alter_column(u'staticpages_agreement', 'agreed_on', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, auto_now_add=True))

# Changing field 'StaticPage.modified_on'
db.alter_column(u'staticpages_staticpage', 'modified_on', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True))

# Changing field 'LegalPage.modified_on'
db.alter_column(u'staticpages_legalpage', 'modified_on', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True))

models = {
u'accounts.user': {
'Meta': {'object_name': 'User'},
'_unit_rows': ('django.db.models.fields.SmallIntegerField', [], {'default': '9', 'db_column': "'unit_rows'"}),
'alt_src_langs': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_alt_src_langs'", 'blank': 'True', 'db_index': 'True', 'to': u"orm['pootle_language.Language']"}),
'bio': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
'currency': ('django.db.models.fields.CharField', [], {'max_length': '3', 'null': 'True', 'blank': 'True'}),
'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'email': ('django.db.models.fields.EmailField', [], {'max_length': '255'}),
'full_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
'hourly_rate': ('django.db.models.fields.FloatField', [], {'default': '0'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'is_employee': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'linkedin': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
'rate': ('django.db.models.fields.FloatField', [], {'default': '0'}),
'review_rate': ('django.db.models.fields.FloatField', [], {'default': '0'}),
'score': ('django.db.models.fields.FloatField', [], {'default': '0'}),
'twitter': ('django.db.models.fields.CharField', [], {'max_length': '15', 'null': 'True', 'blank': 'True'}),
'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
'website': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
},
u'auth.group': {
'Meta': {'object_name': 'Group'},
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
},
u'auth.permission': {
'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
},
u'contenttypes.contenttype': {
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
},
'pootle_app.directory': {
'Meta': {'ordering': "['name']", 'object_name': 'Directory'},
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
'obsolete': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'child_dirs'", 'null': 'True', 'to': "orm['pootle_app.Directory']"}),
'pootle_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'})
},
u'pootle_language.language': {
'Meta': {'ordering': "['code']", 'object_name': 'Language', 'db_table': "'pootle_app_language'"},
'code': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50', 'db_index': 'True'}),
'directory': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['pootle_app.Directory']", 'unique': 'True'}),
'fullname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'nplurals': ('django.db.models.fields.SmallIntegerField', [], {'default': '0'}),
'pluralequation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
'specialchars': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'})
},
u'staticpages.agreement': {
'Meta': {'unique_together': "(('user', 'document'),)", 'object_name': 'Agreement'},
'agreed_on': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'document': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['staticpages.LegalPage']"}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
},
u'staticpages.legalpage': {
'Meta': {'object_name': 'LegalPage'},
'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'body': ('pootle.core.markup.fields.MarkupField', [], {'blank': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'modified_on': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
'virtual_path': ('django.db.models.fields.CharField', [], {'default': "''", 'unique': 'True', 'max_length': '100'})
},
u'staticpages.staticpage': {
'Meta': {'object_name': 'StaticPage'},
'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'body': ('pootle.core.markup.fields.MarkupField', [], {'blank': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'modified_on': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'title': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
'virtual_path': ('django.db.models.fields.CharField', [], {'default': "''", 'unique': 'True', 'max_length': '100'})
}
}

complete_apps = ['staticpages']
10 changes: 7 additions & 3 deletions pootle/apps/staticpages/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ class AbstractPage(DirtyFieldsMixin, models.Model):
modified_on = models.DateTimeField(
default=now,
editable=False,
auto_now_add=True,
)

objects = PageManager()
Expand Down Expand Up @@ -150,9 +149,14 @@ class Agreement(models.Model):
agreed_on = models.DateTimeField(
default=now,
editable=False,
auto_now_add=True,
auto_now=True,
)

class Meta:
unique_together = ('user', 'document',)

def save(self, **kwargs):
# When updating always explicitly renew agreement date
if self.pk:
self.agreed_on = now()

super(Agreement, self).save(**kwargs)

0 comments on commit e50ee88

Please sign in to comment.