Changeset c27da9e


Ignore:
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
Files:
5 edited
1 moved

Legend:

Unmodified
Added
Removed

  • asadb/forms/admin.py

    rdafa3c8 rc27da9e  
    1212    list_display_links = ('group', 'display_name', 'year', )
    1313
    14 class FYSMTagAdmin(admin.ModelAdmin):
     14class FYSMCategoryAdmin(admin.ModelAdmin):
    1515    list_display = (
    1616        'name',
    … …  
    1919
    2020admin.site.register(forms.models.FYSM, FYSMAdmin)
    21 admin.site.register(forms.models.FYSMTag, FYSMTagAdmin)
     21admin.site.register(forms.models.FYSMCategory, FYSMCategoryAdmin)

  • asadb/forms/models.py

    r80194d8 rc27da9e  
    1414    description = models.TextField(help_text="Explain in about three or four sentences what your group does and why incoming freshmen should get involved.")
    1515    logo = models.ImageField(upload_to='fysm/logos', )
    16     tags = models.ManyToManyField('FYSMTag', blank=True, )
     16    categories = models.ManyToManyField('FYSMCategory', blank=True, )
    1717
    1818    class Meta:
    1919        verbose_name = "FYSM submission"
    2020
    21 class FYSMTag(models.Model):
     21class FYSMCategory(models.Model):
    2222    name = models.CharField(max_length=10)
    2323    slug = models.SlugField()
    … …  
    2828
    2929    class Meta:
    30         verbose_name = "FYSM tag"
     30        verbose_name = "FYSM category"
     31        verbose_name_plural = "FYSM categories"

  • asadb/forms/templatetags/formcats.py

    r189506e rc27da9e  
    99    print year
    1010    snippets = ["<a href='%s'>%s</a>" % (
    11         reverse('fysm', args=[year, tag.slug, ]),
    12         tag,
    13     ) for tag in fysm.tags.all()]
    14     # Mark this as safe. This assumes that the tags are safe...
     11        reverse('fysm', args=[year, category.slug, ]),
     12        category,
     13    ) for category in fysm.categories.all()]
     14    # Mark this as safe. This assumes that the categories are safe...
    1515    return django.utils.safestring.mark_safe(", ".join(snippets))

  • asadb/forms/views.py

    r2f7114b rc27da9e  
    5959    category_obj = None
    6060    if category != None:
    61         category_obj = get_object_or_404(forms.models.FYSMTag, slug=category)
    62         queryset = queryset.filter(tags=category_obj)
    63     categories = forms.models.FYSMTag.objects.all()
     61        category_obj = get_object_or_404(forms.models.FYSMCategory, slug=category)
     62        queryset = queryset.filter(categories=category_obj)
     63    categories = forms.models.FYSMCategory.objects.all()
    6464    return list_detail.object_list(
    6565        request,
    … …  
    9595            'description',
    9696            'logo',
    97             'tags',
     97            'categories',
    9898        )
    9999

  • asadb/template/fysm/fysm_listing.html

    r02e5709 rc27da9e  
    11{% extends "base.html" %}
    2 {% load formtags %}
     2{% load formcats %}
    33
    44{% block title %}First Year Summer Mailing{% endblock %}
    … …  
    2828    <p class='data'>{{fysm.description}}</p>
    2929    <p class='join'><a href='{{fysm.join_url}}'>Join {{fysm.display_name}}!</a> Have questions? Send them to <a href='mailto:{{fysm.contact_email}}'>{{fysm.contact_email}}</a>!</p>
    30     {% if fysm.tags.all %}
    31     <p class='tags'>tags: {{fysm|format_categories:year}}</p>
     30    {% if fysm.categories.all %}
     31    <p class='tags'>categories: {{fysm|format_categories:year}}</p>
    3232    {% endif %}
    3333</div>

  • asadb/template/fysm/update_email.txt

    r90afb00 rc27da9e  
    1010Join URL:       {{fysm.join_url}}
    1111Contact email:  {{fysm.contact_email}}
    12 Tags:           {{fysm.tags.all}}
     12Categories:     {{fysm.categories.all}}
    1313
    1414Please return to {{request.build_absolute_uri}} to update this further.
Note: See TracChangeset for help on using the changeset viewer.