Changeset 51b384a

Timestamp:

Sep 10, 2012, 4:50:40 AM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

72a3d90

Parents:

71e71e3

git-author:

Alex Dehnert <adehnert@…> (09/10/12 04:50:40)

git-committer:

Alex Dehnert <adehnert@…> (09/10/12 04:50:40)

Message:

Validate constitution_url (ASA-#76)

Location:

asadb

Files:

• groups/models.py (modified) (2 diffs)
• groups/views.py (modified) (1 diff)
• mit/__init__.py (modified) (2 diffs)

asadb/groups/models.py

@@ -16 +16 @@
 import settings
 
+import mit
+
 # Create your models here.
 
@@ -33 +35 @@
     group_funding = models.ForeignKey('GroupFunding', null=True, blank=True, db_index=True, )
     website_url = models.URLField()
-    constitution_url = models.CharField(max_length=200, blank=True)
+    constitution_url = models.CharField(max_length=200, blank=True, validators=[mit.UrlOrAfsValidator])
     meeting_times = models.TextField(blank=True)
     advisor_name = models.CharField(max_length=100, blank=True)

asadb/groups/views.py

@@ -128 +128 @@
         for field in self.force_required:
             self.fields[field].required = True
-        self.fields['constitution_url'].help_text = mark_safe("Please put your current constitution URL, if you have one.<br>If your constitution is currently an AFS path, you can either use the corresponding web.mit.edu (e.g., http://web.mit.edu/locker/path/to/const.html) or stuff.mit.edu path, or just use http://asa.mit.edu/const/afs/your-afs-path.<br>If you don't currently know where your constitution is, put http://mit.edu/asa/start/constitution-req.html.<br>(In either of these last two cases, we'll get in touch with you later about putting something better in.)")
+        self.fields['constitution_url'].help_text = mark_safe("""Please put your current constitution URL or AFS path.<br>If you don't currently know where your constitution is, put "http://mit.edu/asa/start/constitution-req.html" and draft a constitution soon.""")
 
     exec_only_fields = [

asadb/mit/__init__.py

@@ -10 +10 @@
 from django.contrib import auth
 from django.core.exceptions import ObjectDoesNotExist
+from django.core.validators import URLValidator, ValidationError
+
 import settings
 
@@ -18 +20 @@
     )
     proc.communicate(msg)
+
+def UrlOrAfsValidator(value):
+    if value.startswith('/mit/') or value.startswith('/afs/'):
+        return
+    else:
+        try:
+            URLValidator()(value)
+        except ValidationError:
+            raise ValidationError('Provide a valid URL or AFS path')
 
 class ScriptsRemoteUserMiddleware(RemoteUserMiddleware):