resolved an ambiguous URL pattern added to secr.sreq.urls and (hopefully) fixed a broken form initializer in code added to secr/sreq/forms

 - Legacy-Id: 7508

Author: rjsparks

ietf/secr/sreq/forms.py

@@ -103,9 +103,11 @@ def __init__(self, *args, **kwargs):
             if self.initial['length_session3'] != '0' and self.initial['length_session3'] != None:
                 self.fields['third_session'].initial = True
 
-        resources = self.initial['resources']
-        resource_choices = [r.pk for r in resources]
-        self.initial['resources'] = resource_choices
+        if self.initial and 'resources' in self.initial:
+            resources = self.initial['resources']
+            resource_choices = [r.pk for r in resources]
+            #self.initial['resources'] = resource_choices
+            self.fields['resources'].initial = resource_choices
 
     def clean_conflict1(self):
         conflict = self.cleaned_data['conflict1']

ietf/secr/sreq/urls.py

@@ -4,7 +4,7 @@
     url(r'^$', 'main', name='sessions'),
     url(r'^status/$', 'tool_status', name='sessions_tool_status'),
     url(r'^(?P<acronym>[A-Za-z0-9_\-\+]+)/$', 'view', name='sessions_view'),
-    url(r'^(?P<num>[A-Za-z0-9_\-\+]+)/(?P<acronym>[A-Za-z0-9_\-\+]+)/$', 'view', name='sessions_view'),
+    url(r'^(?P<num>[A-Za-z0-9_\-\+]+)/(?P<acronym>[A-Za-z0-9_\-\+]+)/view/$', 'view', name='sessions_view'),
     url(r'^(?P<acronym>[A-Za-z0-9_\-\+]+)/approve/$', 'approve', name='sessions_approve'),
     url(r'^(?P<acronym>[A-Za-z0-9_\-\+]+)/cancel/$', 'cancel', name='sessions_cancel'),
     url(r'^(?P<acronym>[A-Za-z0-9_\-\+]+)/confirm/$', 'confirm', name='sessions_confirm'),