Changeset 3496370

Timestamp:

Jul 6, 2012, 2:49:11 AM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

cbdbd1f

Parents:

cd98e17

git-author:

Alex Dehnert <adehnert@…> (07/06/12 02:33:16)

git-committer:

Alex Dehnert <adehnert@…> (07/06/12 02:49:11)

Message:

Forbid commas in FYSM display names (ASA Trac #40)

This is perhaps overenthusiastic, especially since groups can't opt out. On
the other hand, we do actually have a handful of groups with commas that
aren't ", MIT" or ", The" that shouldn't have the comma in their display
name, and I sorta want to catch them too. Also, we have maybe one group
that should have a comma in their display name...

Location:

asadb/forms

Files:

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

asadb/forms/models.py

@@ -11 +11 @@
 class FYSM(models.Model):
     group = models.ForeignKey(groups.models.Group, db_index=True, )
-    display_name = models.CharField(max_length=50)
+    display_name = models.CharField(max_length=50, help_text="""Form of your name suitable for display (for example, don't end your name with ", MIT")""")
     year = models.IntegerField(db_index=True, )
     website = models.URLField()

asadb/forms/views.py

@@ -17 +17 @@
 from django.forms import ModelForm
 from django.forms import ModelChoiceField, ModelMultipleChoiceField
+from django.forms import ValidationError
 from django.db import connection
 from django.db.models import Q, Count
@@ -149 +150 @@
         )
 
+    def clean_display_name(self, ):
+        name = self.cleaned_data['display_name']
+        if ',' in name:
+            raise ValidationError("""In general, commas in a display name are a mistake and will look bad (group names like "Punctuation Society, MIT" should probably be "Punctuation Society"). If you do want a comma, contact asa-fysm@mit.edu and we'll put it in for you.""")
+        return name
+
 @login_required
 def fysm_manage(request, group, ):