Changeset 3af5d74 for asadb

Timestamp:

Sep 10, 2012, 5:01:47 AM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

e0632f6

Parents:

26fd6cf

git-author:

Alex Dehnert <adehnert@…> (09/10/12 05:01:47)

git-committer:

Alex Dehnert <adehnert@…> (09/10/12 05:01:47)

Message:

Valid Athena lockernames

Also, everyone should have a locker in the DB. Explaining how to find your
locker should be unnecessary (and it never seemed to work very well).

File:

• asadb/groups/models.py (modified) (3 diffs)

asadb/groups/models.py

@@ -1 +1 @@
 from django.db import models
+from django.core.validators import RegexValidator
 from django.contrib.auth.models import User
 from django.template.defaultfilters import slugify
@@ -21 +22 @@
             group_status__slug='active',
         )
+
+locker_validator = RegexValidator(regex=r'^[-A-Za-z0-9_.]+$', message='Enter a valid Athena locker.')
 
 class Group(models.Model):
@@ -42 +45 @@
     main_account_id = models.IntegerField(null=True, blank=True, )
     funding_account_id = models.IntegerField(null=True, blank=True, )
-    athena_locker = models.CharField(max_length=20, blank=True, help_text="Often, this will appear in your group's URL --- http://web.mit.edu/SOME_VARIANT_OF_GROUP_NAME/, http://www.mit.edu/~SOME_VARIANT_OF_GROUP_NAME/ and http://SOME_VARIANT_OF_GROUP_NAME.scripts.mit.edu/ all correspond to a locker name of SOME_VARIANT_OF_GROUP_NAME. Also, you can probably find this in your entry in the old database.")
+    athena_locker = models.CharField(max_length=20, blank=True, validators=[locker_validator])
     recognition_date = models.DateTimeField()
     update_date = models.DateTimeField(editable=False, )