diff --git a/snipt/migrate.py b/snipt/migrate.py index e868030..7cdd07d 100644 --- a/snipt/migrate.py +++ b/snipt/migrate.py @@ -6,7 +6,7 @@ import MySQLdb from django.contrib.auth.models import User -from snipts.models import Snipt +from snipts.models import Favorite, Snipt from taggit.models import Tag, TaggedItem from taggit.utils import parse_tags from tastypie.models import ApiKey @@ -120,6 +120,35 @@ def snipts(): print 'Done with snipts' +def favs(): + + print "Deleting existing favorites" + favs = Favorite.objects.all() + for f in favs: + f.delete() + + cursor.execute("SELECT * FROM favsnipt_favsnipt") + rows = cursor.fetchall() + + print "Adding favorites" + + for row in rows: + fav_id = row[0] + snipt_id = row[1] + user_id = row[2] + created = row[3] + + fav = Favorite( + id=fav_id, + snipt_id=snipt_id, + user_id=user_id, + created=created, + modified=created, + ) + fav.save() + + print 'Done with favorites' + def parse_tag_input(input): """ Parses tag input, with multiple word input being activated and diff --git a/snipt/snipts/admin.py b/snipt/snipts/admin.py index 2f5131f..9420071 100644 --- a/snipt/snipts/admin.py +++ b/snipt/snipts/admin.py @@ -1,8 +1,9 @@ from django.contrib import admin -from snipts.models import Snipt +from snipts.models import Favorite, Snipt class SniptAdmin(admin.ModelAdmin): + readonly_fields = ('user',) list_display = ('title', 'slug', 'user', 'lexer', 'public', 'created', 'modified',) search_fields = ('title', 'user__username', 'lexer', 'id',) ordering = ('-created',) @@ -10,3 +11,10 @@ class SniptAdmin(admin.ModelAdmin): admin.site.register(Snipt, SniptAdmin) +class FavoriteAdmin(admin.ModelAdmin): + #readonly_fields = ('snipt', 'user',) + list_display = ('snipt', 'user',) + search_fields = ('snipt', 'user',) + ordering = ('-created',) + +admin.site.register(Favorite, FavoriteAdmin) diff --git a/snipt/snipts/migrations/0018_auto__add_favorite__chg_field_snipt_modified__chg_field_snipt_created.py b/snipt/snipts/migrations/0018_auto__add_favorite__chg_field_snipt_modified__chg_field_snipt_created.py new file mode 100644 index 0000000..7f5ad18 --- /dev/null +++ b/snipt/snipts/migrations/0018_auto__add_favorite__chg_field_snipt_modified__chg_field_snipt_created.py @@ -0,0 +1,116 @@ +# 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): + + # Adding model 'Favorite' + db.create_table('snipts_favorite', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('snipt', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['snipts.Snipt'])), + ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])), + ('created', self.gf('django.db.models.fields.DateTimeField')()), + ('modified', self.gf('django.db.models.fields.DateTimeField')()), + )) + db.send_create_signal('snipts', ['Favorite']) + + # 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')()) + + + def backwards(self, orm): + + # Deleting model 'Favorite' + db.delete_table('snipts_favorite') + + # 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)) + + + 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.favorite': { + 'Meta': {'object_name': 'Favorite'}, + 'created': ('django.db.models.fields.DateTimeField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'modified': ('django.db.models.fields.DateTimeField', [], {}), + 'snipt': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['snipts.Snipt']"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'snipts.snipt': { + 'Meta': {'object_name': 'Snipt'}, + 'code': ('django.db.models.fields.TextField', [], {}), + 'created': ('django.db.models.fields.DateTimeField', [], {}), + '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', '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'}), + 'modified': ('django.db.models.fields.DateTimeField', [], {}), + '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', [], {'null': 'True', 'blank': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}) + }, + '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 2adf453..6e34fab 100644 --- a/snipt/snipts/models.py +++ b/snipt/snipts/models.py @@ -1,4 +1,3 @@ -from django.template.defaultfilters import slugify from django.contrib.sites.models import Site from django.contrib.auth.models import User from django.conf import settings @@ -22,21 +21,22 @@ class Snipt(models.Model): user = models.ForeignKey(User, blank=True, null=True) - title = models.CharField(max_length=255) + title = models.CharField(max_length=255) description = models.TextField(blank=True, null=True) - slug = models.SlugField(max_length=255, blank=True) - tags = TaggableManager() + slug = models.SlugField(max_length=255, blank=True) + tags = TaggableManager() - lexer = models.CharField(max_length=50) - code = models.TextField() - stylized = models.TextField(blank=True, null=True) + lexer = models.CharField(max_length=50) + code = models.TextField() + stylized = models.TextField(blank=True, null=True) line_count = models.IntegerField(blank=True, null=True, default=None) key = models.CharField(max_length=100, blank=True, null=True) public = models.BooleanField(default=False) - created = models.DateTimeField(auto_now_add=True, editable=False) - modified = models.DateTimeField(auto_now=True, editable=False) + # TODO: Change back auto + created = models.DateTimeField(auto_now_add=False, editable=False) + modified = models.DateTimeField(auto_now=False, editable=False) def save(self, *args, **kwargs): @@ -57,7 +57,7 @@ class Snipt(models.Model): return self.title def get_absolute_url(self): - return '/%s/%s/' % (self.user.username, self.slug) + return '/{}/{}/'.format(self.user.username, self.slug) def get_full_absolute_url(self): if settings.DEBUG: @@ -67,12 +67,12 @@ class Snipt(models.Model): root = 'https://snipt.net' else: root = 'http://snipt.net' - return '%s/%s/%s/' % (root, self.user.username, self.slug) + return '{}/{}/{}/'.format(root, self.user.username, self.slug) def get_embed_url(self): - return 'http%s://%s/embed/%s/' % ('s' if settings.USE_HTTPS else '', - site.domain, - self.key) + return 'http{}://{}/embed/{}/'.format('s' if settings.USE_HTTPS else '', + site.domain, + self.key) @property def sorted_tags(self): @@ -81,3 +81,14 @@ class Snipt(models.Model): @property def lexer_name(self): return get_lexer_by_name(self.lexer).name + +class Favorite(models.Model): + snipt = models.ForeignKey(Snipt) + user = models.ForeignKey(User) + + # TODO: Change back auto + created = models.DateTimeField(auto_now_add=False, editable=False) + modified = models.DateTimeField(auto_now=False, editable=False) + + def __unicode__(self): + return u'{} favorited by {}'.format(self.snipt.title, self.user.username) diff --git a/snipt/snipts/templates/snipts/snipt-list.html b/snipt/snipts/templates/snipts/snipt-list.html index bc1b7cc..15e9f6e 100644 --- a/snipt/snipts/templates/snipts/snipt-list.html +++ b/snipt/snipts/templates/snipts/snipt-list.html @@ -40,7 +40,7 @@

{{ snipt.tags.all|length }} tag{{ snipt.tags.all|pluralize }}