diff --git a/snipt/migrate.py b/snipt/migrate.py index 2d4585a..d1b7107 100644 --- a/snipt/migrate.py +++ b/snipt/migrate.py @@ -18,7 +18,6 @@ def i(): users() create_api_keys() snipts() - comments() def users(): diff --git a/snipt/snipts/api.py b/snipt/snipts/api.py index 5e0ea84..fedf72f 100644 --- a/snipt/snipts/api.py +++ b/snipt/snipts/api.py @@ -120,7 +120,6 @@ class PrivateTagResource(ModelResource): class PrivateSniptResource(ModelResource): user = fields.ForeignKey(PrivateUserResource, 'user', full=True) - tags = fields.ToManyField(PrivateTagResource, 'tags', related_name='tag', full=True) class Meta: queryset = Snipt.objects.all().order_by('-created') @@ -132,7 +131,7 @@ class PrivateSniptResource(ModelResource): list_allowed_methods = ['get', 'post'] authentication = ApiKeyAuthentication() authorization = DjangoAuthorization() - #cache = SimpleCache() + cache = SimpleCache() def dehydrate(self, bundle): bundle.data['embed_url'] = bundle.obj.get_embed_url() diff --git a/snipt/snipts/migrations/0016_auto__del_comment__chg_field_snipt_modified__chg_field_snipt_created.py b/snipt/snipts/migrations/0016_auto__del_comment__chg_field_snipt_modified__chg_field_snipt_created.py new file mode 100644 index 0000000..5e3d2e2 --- /dev/null +++ b/snipt/snipts/migrations/0016_auto__del_comment__chg_field_snipt_modified__chg_field_snipt_created.py @@ -0,0 +1,109 @@ +# encoding: utf-8 +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + +class Migration(SchemaMigration): + + def forwards(self, orm): + + # Deleting model 'Comment' + db.delete_table('snipts_comment') + + # Changing field 'Snipt.modified' + db.alter_column('snipts_snipt', 'modified', self.gf('django.db.models.fields.DateTimeField')(auto_now=True)) + + # Changing field 'Snipt.created' + db.alter_column('snipts_snipt', 'created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True)) + + + def backwards(self, orm): + + # Adding model 'Comment' + db.create_table('snipts_comment', ( + ('comment', self.gf('django.db.models.fields.TextField')()), + ('created', self.gf('django.db.models.fields.DateTimeField')()), + ('snipt', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['snipts.Snipt'])), + ('modified', self.gf('django.db.models.fields.DateTimeField')()), + ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])), + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + )) + db.send_create_signal('snipts', ['Comment']) + + # Changing field 'Snipt.modified' + db.alter_column('snipts_snipt', 'modified', self.gf('django.db.models.fields.DateTimeField')()) + + # Changing field 'Snipt.created' + db.alter_column('snipts_snipt', 'created', self.gf('django.db.models.fields.DateTimeField')()) + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('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'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + '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'}), + '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'}) + }, + 'snipts.snipt': { + 'Meta': {'object_name': 'Snipt'}, + 'code': ('django.db.models.fields.TextField', [], {}), + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'key': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'lexer': ('django.db.models.fields.CharField', [], {'max_length': '50'}), + 'line_count': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'slug': ('django.db.models.fields.SlugField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}), + 'stylized': ('django.db.models.fields.TextField', [], {}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'taggit.tag': { + 'Meta': {'object_name': 'Tag'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '100', 'db_index': 'True'}) + }, + 'taggit.taggeditem': { + 'Meta': {'object_name': 'TaggedItem'}, + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taggit_taggeditem_tagged_items'", 'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'object_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), + 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taggit_taggeditem_items'", 'to': "orm['taggit.Tag']"}) + } + } + + complete_apps = ['snipts'] diff --git a/snipt/snipts/models.py b/snipt/snipts/models.py index d5292b8..8b367a7 100644 --- a/snipt/snipts/models.py +++ b/snipt/snipts/models.py @@ -31,9 +31,8 @@ class Snipt(models.Model): key = models.CharField(max_length=100) public = models.BooleanField(default=False) - # TODO Set back to True for production! - created = models.DateTimeField(auto_now_add=False, editable=False) - modified = models.DateTimeField(auto_now=False, editable=False) + created = models.DateTimeField(auto_now_add=True, editable=False) + modified = models.DateTimeField(auto_now=True, editable=False) def save(self, *args, **kwargs): if not self.slug: @@ -89,21 +88,3 @@ class Snipt(models.Model): @property def lexer_name(self): return get_lexer_by_name(self.lexer).name - -class Comment(models.Model): - """A comment on a Snipt""" - - user = models.ForeignKey(User) - snipt = models.ForeignKey(Snipt) - - comment = models.TextField() - - # TODO Set back to True for production! - created = models.DateTimeField(auto_now_add=False, editable=False) - modified = models.DateTimeField(auto_now=False, editable=False) - - def __unicode__(self): - return u'%s on %s' %(self.user, self.snipt) - - def get_absolute_url(self): - return '%s#comment-%d' % (self.snipt.get_absolute_url(), self.id)