diff --git a/snipts/api.py b/snipts/api.py index bb9c613..56468eb 100644 --- a/snipts/api.py +++ b/snipts/api.py @@ -210,7 +210,7 @@ class PublicSniptResource(ModelResource): queryset = Snipt.objects.filter(public=True).order_by('-created') resource_name = 'snipt' fields = ['id', 'title', 'slug', 'lexer', 'code', 'description', 'line_count', - 'stylized', 'created', 'modified', 'publish_date', 'blog_post'] + 'stylized', 'created', 'modified', 'publish_date', 'blog_post', 'meta',] include_absolute_url = True allowed_methods = ['get'] filtering = { 'user': 'exact', 'blog_post': 'exact' } @@ -309,7 +309,7 @@ class PrivateSniptResource(ModelResource): queryset = Snipt.objects.all().order_by('-created') resource_name = 'snipt' fields = ['id', 'title', 'slug', 'lexer', 'code', 'description', 'line_count', 'stylized', - 'key', 'public', 'blog_post', 'created', 'modified', 'publish_date',] + 'key', 'public', 'blog_post', 'created', 'modified', 'publish_date', 'meta',] include_absolute_url = True detail_allowed_methods = ['get', 'patch', 'put', 'delete'] list_allowed_methods = ['get', 'post'] diff --git a/snipts/migrations/0028_auto__add_field_snipt_meta.py b/snipts/migrations/0028_auto__add_field_snipt_meta.py new file mode 100644 index 0000000..4f36244 --- /dev/null +++ b/snipts/migrations/0028_auto__add_field_snipt_meta.py @@ -0,0 +1,92 @@ +# -*- coding: 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): + # Adding field 'Snipt.meta' + db.add_column(u'snipts_snipt', 'meta', + self.gf('django.db.models.fields.TextField')(null=True, blank=True), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'Snipt.meta' + db.delete_column(u'snipts_snipt', 'meta') + + + models = { + 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'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), + u'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', [], {'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'}) + }, + 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'}) + }, + u'snipts.favorite': { + 'Meta': {'object_name': 'Favorite'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'snipt': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['snipts.Snipt']"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}) + }, + u'snipts.snipt': { + 'Meta': {'object_name': 'Snipt'}, + 'blog_post': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'code': ('django.db.models.fields.TextField', [], {}), + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'custom_slug': ('django.db.models.fields.SlugField', [], {'max_length': '255', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'embedded': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'key': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'lexer': ('django.db.models.fields.CharField', [], {'max_length': '50'}), + 'line_count': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), + 'meta': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'publish_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '255', 'blank': 'True'}), + 'stylized': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'stylized_min': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'default': "'Untitled'", 'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}), + 'views': ('django.db.models.fields.IntegerField', [], {'default': '0'}) + } + } + + complete_apps = ['snipts'] \ No newline at end of file diff --git a/snipts/models.py b/snipts/models.py index 15c0d33..b333599 100644 --- a/snipts/models.py +++ b/snipts/models.py @@ -30,6 +30,7 @@ class Snipt(models.Model): lexer = models.CharField(max_length=50) code = models.TextField() + meta = models.TextField(blank=True, null=True) description = models.TextField(blank=True, null=True) stylized = models.TextField(blank=True, null=True) stylized_min = models.TextField(blank=True, null=True)