Changeset c27da9e for asadb/forms

Timestamp:

May 15, 2010, 11:37:31 PM (16 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, fysm-4-1, iframe, space-access, stable, stage, test-hooks

Children:

df381cb

Parents:

2f7114b

git-author:

Alex Dehnert <adehnert@…> (05/15/10 23:37:31)

git-committer:

Alex Dehnert <adehnert@…> (05/15/10 23:37:31)

Message:

Use the name "category" consistently

We want to support ASA-defined "categories" and free-form "tags".
Unfortunately, when originally coding I used the terms interchangeably.
This replaces instances of the "tag" name with the "category" name,
thus freeing up "tag" for the new semantics.

Location:

asadb/forms

Files:

• admin.py (modified) (2 diffs)
• models.py (modified) (2 diffs)
• templatetags/formcats.py (moved) (moved from asadb/forms/templatetags/formtags.py) (1 diff)
• views.py (modified) (2 diffs)

asadb/forms/admin.py

@@ -12 +12 @@
     list_display_links = ('group', 'display_name', 'year', )
 
-class FYSMTagAdmin(admin.ModelAdmin):
+class FYSMCategoryAdmin(admin.ModelAdmin):
     list_display = (
         'name',
@@ -19 +19 @@
 
 admin.site.register(forms.models.FYSM, FYSMAdmin)
-admin.site.register(forms.models.FYSMTag, FYSMTagAdmin)
+admin.site.register(forms.models.FYSMCategory, FYSMCategoryAdmin)

asadb/forms/models.py

@@ -14 +14 @@
     description = models.TextField(help_text="Explain in about three or four sentences what your group does and why incoming freshmen should get involved.")
     logo = models.ImageField(upload_to='fysm/logos', )
-    tags = models.ManyToManyField('FYSMTag', blank=True, )
+    categories = models.ManyToManyField('FYSMCategory', blank=True, )
 
     class Meta:
         verbose_name = "FYSM submission"
 
-class FYSMTag(models.Model):
+class FYSMCategory(models.Model):
     name = models.CharField(max_length=10)
     slug = models.SlugField()
@@ -28 +28 @@
 
     class Meta:
-        verbose_name = "FYSM tag"
+        verbose_name = "FYSM category"
+        verbose_name_plural = "FYSM categories"

asadb/forms/templatetags/formcats.py

@@ -9 +9 @@
     print year
     snippets = ["<a href='%s'>%s</a>" % (
-        reverse('fysm', args=[year, tag.slug, ]),
-        tag,
-    ) for tag in fysm.tags.all()]
-    # Mark this as safe. This assumes that the tags are safe...
+        reverse('fysm', args=[year, category.slug, ]),
+        category,
+    ) for category in fysm.categories.all()]
+    # Mark this as safe. This assumes that the categories are safe...
     return django.utils.safestring.mark_safe(", ".join(snippets))

asadb/forms/views.py

@@ -59 +59 @@
     category_obj = None
     if category != None:
-        category_obj = get_object_or_404(forms.models.FYSMTag, slug=category)
-        queryset = queryset.filter(tags=category_obj)
-    categories = forms.models.FYSMTag.objects.all()
+        category_obj = get_object_or_404(forms.models.FYSMCategory, slug=category)
+        queryset = queryset.filter(categories=category_obj)
+    categories = forms.models.FYSMCategory.objects.all()
     return list_detail.object_list(
         request,
@@ -95 +95 @@
             'description',
             'logo',
-            'tags',
+            'categories',
         )