changes to support video content in proceedings ('recording' document type). Commit ready for merge

 - Legacy-Id: 8237

Author: rpcross

ietf/doc/models.py

@@ -3,7 +3,9 @@
 import datetime, os
 
 from django.db import models
+from django.core.exceptions import ValidationError
 from django.core.urlresolvers import reverse as urlreverse
+from django.core.validators import URLValidator
 from django.contrib.contenttypes.models import ContentType
 from django.conf import settings
 from django.utils.html import mark_safe
@@ -90,6 +92,13 @@ def get_file_path(self):
             return settings.DOCUMENT_PATH_PATTERN.format(doc=self)
 
     def href(self):
+        validator = URLValidator()
+        try:
+            validator(self.external_url)
+            return self.external_url
+        except ValidationError:
+            pass
+
         meeting_related = self.meeting_related()
 
         settings_var = settings.DOC_HREFS

ietf/ietfauth/utils.py

@@ -51,10 +51,10 @@ def has_role(user, role_names, *args, **kwargs):
 	    "IRTF Chair": Q(person=person, name="chair", group__acronym="irtf"),
 	    "IAB Chair": Q(person=person, name="chair", group__acronym="iab"),
             "IAB Group Chair": Q(person=person, name="chair", group__type="iab", group__state="active"),
-	    "WG Chair": Q(person=person,name="chair", group__type="wg", group__state__in=["active","bof"]),
-	    "WG Secretary": Q(person=person,name="secr", group__type="wg", group__state__in=["active","bof"]),
-	    "RG Chair": Q(person=person,name="chair", group__type="rg", group__state="active"),
-	    "RG Secretary": Q(person=person,name="secr", group__type="rg", group__state="active"),
+            "WG Chair": Q(person=person,name="chair", group__type="wg", group__state__in=["active","bof","proposed"]),
+            "WG Secretary": Q(person=person,name="secr", group__type="wg", group__state__in=["active","bof","proposed"]),
+            "RG Chair": Q(person=person,name="chair", group__type="rg", group__state="active"),
+            "RG Secretary": Q(person=person,name="secr", group__type="rg", group__state="active"),
             "Team Chair": Q(person=person,name="chair", group__type="team", group__state="active"),
             "Nomcom Chair": Q(person=person, name="chair", group__type="nomcom", group__state="active", group__acronym__icontains=kwargs.get('year', '0000')),
             "Nomcom Advisor": Q(person=person, name="advisor", group__type="nomcom", group__state="active", group__acronym__icontains=kwargs.get('year', '0000')),