Working on tags

migrate.py

@@ -5,6 +5,7 @@ import MySQLdb
 from django.contrib.auth.models import User
 
 from snipts.models import Comment, Snipt
+from taggit.models import Tag, TaggedItem
 
 conn = MySQLdb.connect(host='localhost', user='root', passwd='root', db='sniptold')
 cursor = conn.cursor()
@@ -61,6 +62,16 @@ def snipts():
     for s in snipts:
         s.delete()
 
+    print "Deleting existing tags"
+    existing_tags = Tag.objects.all()
+    existing_tagged_items = Tag.objects.all()
+
+    for t in existing_tags:
+        t.delete()
+
+    for t in existing_tagged_items:
+        t.delete()
+
     cursor.execute("SELECT * FROM snippet_snippet")
     rows = cursor.fetchall()
 
@@ -84,10 +95,14 @@ def snipts():
             lexer=lexer,
             key=key,
             user=User.objects.get(id=user_id),
-            tags=tags,
             public=public,
             created=created,
         )
+
+        tags = tags.split(',')
+        for t in tags:
+            snipt.tags.add(t.strip())
+
         snipt.save()
 
     print 'Done with snipts'

requirements.txt

@@ -14,6 +14,7 @@
 -e hg+ssh://hg@bitbucket.org/nicksergeant/dwfab#egg=dwfab
 
 BeautifulSoup
+django-taggit
 django-postmark
 johnny-cache
 python-memcached

settings.py

@@ -61,6 +61,7 @@ INSTALLED_APPS = (
     'compressor',
     'django_bcrypt',
     'south',
+    'taggit',
 
     'snipts',
 )

snipts/admin.py

@@ -3,12 +3,14 @@ from django.contrib import admin
 from snipts.models import Comment, Snipt
 
 class CommentInline(admin.TabularInline):
+    readonly_fields = ('user', 'snipt',)
     model = Comment
     extra = 0
     allow_add = False
 
 class SniptAdmin(admin.ModelAdmin):
-    list_display = ('title', 'slug', 'tags', 'user', 'lexer', 'public', 'created', 'modified',)
+    readonly_fields = ('user',)
+    list_display = ('title', 'slug', 'user', 'lexer', 'public', 'created', 'modified',)
     search_fields = ('title', 'user__username', 'tags', 'lexer', 'id',)
     ordering = ('created',)
     prepopulated_fields = {'slug': ('title',)}
@@ -17,6 +19,7 @@ class SniptAdmin(admin.ModelAdmin):
 admin.site.register(Snipt, SniptAdmin)
 
 class CommentAdmin(admin.ModelAdmin):
+    readonly_fields = ('user', 'snipt',)
     list_display = ('comment', 'user', 'snipt', 'created', 'modified',)
     search_fields = ('comment', 'user__username',)
     ordering = ('created',)

snipts/migrations/0006_auto__del_field_snipt_tags__add_field_snipt_old_tags.py

@@ -0,0 +1,103 @@
+# 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 field 'Snipt.tags'
+        db.delete_column('snipts_snipt', 'tags')
+
+        # Adding field 'Snipt.old_tags'
+        db.add_column('snipts_snipt', 'old_tags', self.gf('django.db.models.fields.CharField')(default='', max_length=255), keep_default=False)
+
+
+    def backwards(self, orm):
+        
+        # Adding field 'Snipt.tags'
+        db.add_column('snipts_snipt', 'tags', self.gf('django.db.models.fields.CharField')(default='', max_length=255), keep_default=False)
+
+        # Deleting field 'Snipt.old_tags'
+        db.delete_column('snipts_snipt', 'old_tags')
+
+
+    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.comment': {
+            'Meta': {'object_name': 'Comment'},
+            'comment': ('django.db.models.fields.TextField', [], {}),
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            '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': "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', [], {}),
+            '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'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'old_tags': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'db_index': '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']

snipts/models.py

@@ -1,14 +1,17 @@
 from django.contrib.auth.models import User
 from django.db import models
 
+from taggit.managers import TaggableManager
+
 class Snipt(models.Model):
     """An individual code snippet."""
 
-    user     = models.ForeignKey(User, editable=False)
+    user     = models.ForeignKey(User)
 
     title    = models.CharField(max_length=255)
     slug     = models.SlugField()
-    tags     = models.CharField(max_length=255)
+    tags     = TaggableManager()
+    old_tags = models.CharField(max_length=255)
 
     lexer    = models.CharField(max_length=50)
     code     = models.TextField()
@@ -27,8 +30,8 @@ class Snipt(models.Model):
 class Comment(models.Model):
     """A comment on a Snipt"""
 
-    user  = models.ForeignKey(User, editable=False)
-    snipt = models.ForeignKey(Snipt, editable=False)
+    user  = models.ForeignKey(User)
+    snipt = models.ForeignKey(Snipt)
 
     comment = models.TextField()