Added linked tags feature. If a tag is linked to some tag, it will be added to the thread along with the specified tag.

boards/migrations/0011_auto__add_field_tag_linked.py

@@ -0,0 +1,73 b''
+# -*- 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 'Tag.linked'
+        db.add_column(u'boards_tag', 'linked',
+                      self.gf('django.db.models.fields.related.ForeignKey')(to=orm['boards.Tag'], null=True, blank=True),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'Tag.linked'
+        db.delete_column(u'boards_tag', 'linked_id')
+
+
+    models = {
+        u'boards.ban': {
+            'Meta': {'object_name': 'Ban'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'})
+        },
+        u'boards.post': {
+            'Meta': {'object_name': 'Post'},
+            '_text_rendered': ('django.db.models.fields.TextField', [], {}),
+            'bump_time': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('boards.thumbs.ImageWithThumbsField', [], {'max_length': '100', 'blank': 'True'}),
+            'image_height': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'image_width': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'last_edit_time': ('django.db.models.fields.DateTimeField', [], {}),
+            'poster_ip': ('django.db.models.fields.GenericIPAddressField', [], {'max_length': '39'}),
+            'poster_user_agent': ('django.db.models.fields.TextField', [], {}),
+            'pub_time': ('django.db.models.fields.DateTimeField', [], {}),
+            'replies': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'re+'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['boards.Post']"}),
+            'tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['boards.Tag']", 'symmetrical': 'False'}),
+            'text': ('markupfield.fields.MarkupField', [], {'rendered_field': 'True'}),
+            'text_markup_type': ('django.db.models.fields.CharField', [], {'default': "'markdown'", 'max_length': '30'}),
+            'thread': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['boards.Post']", 'null': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'to': u"orm['boards.User']", 'null': 'True'})
+        },
+        u'boards.setting': {
+            'Meta': {'object_name': 'Setting'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['boards.User']"}),
+            'value': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'boards.tag': {
+            'Meta': {'object_name': 'Tag'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'linked': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['boards.Tag']", 'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'threads': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'tag+'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['boards.Post']"})
+        },
+        u'boards.user': {
+            'Meta': {'object_name': 'User'},
+            'fav_tags': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['boards.Tag']", 'null': 'True', 'blank': 'True'}),
+            'fav_threads': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['boards.Post']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'rank': ('django.db.models.fields.IntegerField', [], {}),
+            'registration_time': ('django.db.models.fields.DateTimeField', [], {}),
+            'user_id': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        }
+    }
+
+    complete_apps = ['boards']
  No newline at end of file

boards/models.py

@@ -168,6 +168,7 b' class Tag(models.Model):'
     name = models.CharField(max_length=100)
     threads = models.ManyToManyField('Post', null=True,
                                      blank=True, related_name='tag+')
+    linked = models.ForeignKey('Tag', null=True, blank=True)
 
     def __unicode__(self):
         return self.name
@@ -187,6 +188,19 b' class Tag(models.Model):'
 
         return reply_count
 
+    def get_linked_tags(self):
+        linked_tags = []
+
+        linked_tag = self.linked
+        if linked_tag:
+            linked_tags.append(linked_tag)
+
+            far_tags = linked_tag.get_linked_tags()
+            if len(far_tags) > 0:
+                linked_tags.extend(far_tags)
+
+        return linked_tags
+
 
 class Post(models.Model):
     """A post is a message."""

boards/templates/boards/tags.html

@@ -22,6 +22,15 b''
                 <a href="{% url 'tag_subscribe' tag.name %}?next={{ request.path }}"
                     class="not_fav">★</a>
             {% endif %}
+            {% if tag.linked %}
+                ( +
+                {% for linked_tag in tag.get_linked_tags %}
+                    <a class="tag" href="{% url 'tag' linked_tag.name %}">
+                        {{ linked_tag.name }}
+                    </a>
+                {% endfor %}
+                )
+            {% endif %}
             <br />
 		{% endfor %}
 	{% else %}

boards/tests.py

@@ -140,10 +140,10 b' class BoardTests(TestCase):'
         Tag.objects.all().delete()
 
         tag_name = u'test_tag'
-        tags, = [Tag.objects.get_or_create(name=tag_name)]
+        tag = Tag.objects.create(name=tag_name)
         client = Client()
 
-        Post.objects.create_post('title', TEST_TEXT, tags=tags)
+        Post.objects.create_post('title', TEST_TEXT, tags=[tag])
 
         existing_post_id = Post.objects.all()[0].id
         response_existing = client.get(THREAD_PAGE + str(existing_post_id) +
@@ -174,3 +174,9 b' class BoardTests(TestCase):'
         self.assertEqual(PAGE_404,
                          response_not_existing.templates[0].name,
                          u'Reply is opened as a thread')
+
+    def test_linked_tag(self):
+        tag = Tag.objects.create(name=u'tag1')
+        linked_tag = Tag.objects.create(name=u'tag2', linked=tag)
+
+        # TODO run add post view and check the tag is added
  No newline at end of file

boards/views.py

@@ -89,6 +89,10 b' def _new_post(request, form, thread_id=b'
                     tag, created = Tag.objects.get_or_create(name=tag_name)
                     tags.append(tag)
 
+                    linked_tags = tag.get_linked_tags()
+                    if len(linked_tags) > 0:
+                        tags.extend(linked_tags)
+
     op = None if thread_id == boards.models.NO_PARENT else \
         get_object_or_404(Post, id=thread_id)
     post = Post.objects.create_post(title=title, text=text, ip=ip,

neboard/settings.py

@@ -85,7 +85,12 b' STATICFILES_FINDERS = ('
 #    'django.contrib.staticfiles.finders.DefaultStorageFinder',
 )
 
-STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.CachedStaticFilesStorage'
+if DEBUG:
+    STATICFILES_STORAGE = \
+        'django.contrib.staticfiles.storage.StaticFilesStorage'
+else:
+    STATICFILES_STORAGE = \
+        'django.contrib.staticfiles.storage.CachedStaticFilesStorage'
 
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = '@1rc$o(7=tt#kd+4s$u6wchm**z^)4x90)7f6z(i&55@o11*8o'

todo.txt

@@ -1,5 +1,5 b''
 = Features =
-[NOT STARTED] Connecting tags to each other
+[DONE] Connecting tags to each other
 [NOT STARTED] Tree view (JS)
 [NOT STARTED] Adding tags to images filename
 [NOT STARTED] Federative network for s2s communication