Changeset 74 for bitstructures/trunk/substructure

Timestamp:

05/28/08 20:22:40 (7 months ago)

Author:

simon

Message:

Implemented tagging.
Switched to arrows for the "Newer | Older" navigation.
Removed special behaviour for logged in users.

Location:

bitstructures/trunk/substructure

Files:

• models.py (modified) (2 diffs)
• urls.py (modified) (1 diff)
• views.py (modified) (3 diffs)

bitstructures/trunk/substructure/models.py

@@ -47 +47 @@
             return '/drafts/%s' % (self.slug)
 
+    def tags(self):
+        entrytags = EntryTag.objects.select_related().filter(entry=self).order_by('number')
+        tags = []
+        for entrytag in entrytags:
+            tags.append(entrytag.tag)
+        return tags
+
     class Admin:
         fields = (
@@ -54 +61 @@
         list_display = ('title', 'get_absolute_url', 'date_published')
         ordering = ['-date_published']
+
+class Tag(models.Model):
+    name = models.CharField(maxlength=50, blank=False)
+
+    def __str__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        return '/tagged-with/%s' % (self.name)
+
+    class Admin:
+        pass
+
+class EntryTag(models.Model):
+    entry = models.ForeignKey(Entry)
+    tag = models.ForeignKey(Tag)
+    number = models.IntegerField()
+
+    class Admin:
+        list_display = ('entry', 'tag', 'number')
+        ordering = ['entry']

bitstructures/trunk/substructure/urls.py

@@ -10 +10 @@
     (r'^fb-atom.xml$', 'atom_feed'),
     (r'^all$', 'all'),
+    (r'^tagged-with/(?P<tag_name>[a-z0-9-]+)$', 'tagged_with'),
     (r'^robots.txt$', 'robots_txt')
 )

bitstructures/trunk/substructure/views.py

@@ -5 +5 @@
 from django.contrib.sites.models import Site
 from django.conf import settings
-from bitstructures.substructure.models import Entry
+from bitstructures.substructure.models import Entry, Tag, EntryTag
 from bitstructures.substructure.codeblocks import MarkdownCodeblocksParser
 
@@ -94 +94 @@
     return render_to_response('substructure/all.html', data)
 
+def tagged_with(request, tag_name):
+    tag = get_object_or_404(Tag, name=tag_name)
+    data = get_context_data(request)
+    data['tag'] = tag
+    data['entry_list'] = get_published_entries_with_tag(tag)
+    return render_to_response('substructure/tagged-with.html', data)
+
+def get_published_entries_with_tag(tag):
+    entrytags = EntryTag.objects.select_related().filter(tag=tag)
+    entry_list = []
+    for entrytag in entrytags:
+        entry = entrytag.entry
+        if entry.is_published:
+            entry_list.append(entry)
+    return entry_list
+
 def robots_txt(request):
     return HttpResponse(render_to_string('substructure/robots.txt'),
@@ -107 +123 @@
     data = { 'MEDIA_URL': settings.MEDIA_URL }
     data['num_published_entries'] = get_published_entries().count()
-    if user_can_change_entry(request):
-        data['user_can_change_entry'] = True
-        data['drafts'] = get_drafts()
     return data
-
-def user_can_change_entry(request):
-    return request.user.has_perm('change_entry')
-
-def get_drafts():
-    return Entry.objects.filter(date_published__isnull=True).order_by('title')