first app for merge, sreq

 - Legacy-Id: 5173

Author: rpcross

ietf/secr/__init__.py

@@ -0,0 +1,8 @@
+__version__ = "1.33"
+
+__date__    = "$Date: 2011/07/26 14:29:17 $"
+
+__rev__     = "$Rev: 3113 $"
+
+__id__      = "$Id: __init__.py,v 1.5 2011/07/26 14:29:17 rcross Exp $"
+

ietf/secr/context_processors.py

@@ -0,0 +1,10 @@
+# Copyright The IETF Trust 2007, All Rights Reserved
+
+from django.conf import settings
+from ietf.secr import __date__, __rev__, __version__, __id__
+
+def server_mode(request):
+    return {'server_mode': settings.SERVER_MODE}
+    
+def secr_revision_info(request):
+    return {'secr_revision_time': __date__[7:32], 'secr_revision_date': __date__[7:17], 'secr_revision_num': __rev__[6:-2], "secr_revision_id": __id__[5:-2], "secr_version_num": __version__ }

ietf/secr/middleware/__init__.py

@@ -0,0 +1,51 @@
+from django.conf import settings
+from django.http import HttpResponseForbidden
+from django.shortcuts import render_to_response
+
+from ietf.ietfauth.decorators import has_role
+            
+import re
+
+class SecAuthMiddleware(object):
+    """
+    Middleware component that performs custom auth check for every
+    request except those excluded by SEC_AUTH_UNRESTRICTED_URLS.
+
+    Since authentication is performed externally at the apache level
+    REMOTE_USER should contain the name of the authenticated
+    user.  If the user is a secretariat than access is granted.  
+    Otherwise return a 401 error page.
+
+    To use, add the class to MIDDLEWARE_CLASSES and define
+    SEC_AUTH_UNRESTRCITED_URLS in your settings.py.
+
+    The following example allows access to anything under "/interim/"
+    to non-secretariat users:
+
+    SEC_AUTH_UNRESTRCITED_URLS = (
+        (r'^/interim/'),
+
+    Also sets custom request attributes:
+    user_is_secretariat
+    user_is_chair
+    user_is_ad
+    )
+
+    """
+ 
+    def __init__(self):
+        self.unrestricted = [re.compile(pattern) for pattern in
+            settings.SEC_AUTH_UNRESTRICTED_URLS]
+
+    def process_view(self, request, view_func, view_args, view_kwargs):
+        # need to initialize user, it doesn't get set when running tests for example
+        user = ''
+        request.user_is_secretariat = False
+
+        if 'REMOTE_USER' in request.META:
+            # do custom auth
+            if has_role(request.user,'Secretariat'):
+                request.user_is_secretariat = True
+                
+        return None
+

ietf/secr/middleware/secauth.py

@@ -0,0 +1,133 @@
+from django import forms
+
+from ietf.group.models import Group
+import os
+
+# -------------------------------------------------
+# Globals
+# -------------------------------------------------
+
+NUM_SESSION_CHOICES = (('','--Please select'),('1','1'),('2','2'))
+LENGTH_SESSION_CHOICES = (('','--Please select'),('1800','30 minutes'),('3600','1 hour'),('5400','1.5 hours'), ('7200','2 hours'),('9000','2.5 hours'))
+WG_CHOICES = list( Group.objects.filter(type__in=('wg','rg','ag'),state__in=('bof','proposed','active')).values_list('acronym','acronym').order_by('acronym'))
+WG_CHOICES.insert(0,('','--Select WG(s)'))
+
+# -------------------------------------------------
+# Helper Functions
+# -------------------------------------------------
+def check_conflict(groups):
+    '''
+    Takes a string which is a list of group acronyms.  Checks that they are all active groups
+    '''
+    # convert to python list (allow space or comma separated lists)
+    items = groups.replace(',',' ').split()
+    active_groups = Group.objects.filter(type__in=('wg','ag','rg'), state__in=('bof','proposed','active'))
+    for group in items:
+        if not active_groups.filter(acronym=group):
+            raise forms.ValidationError("Invalid or inactive group acronym: %s" % group)
+            
+def join_conflicts(data):
+    '''
+    Takes a dictionary (ie. data dict from a form) and concatenates all
+    conflict fields into one list
+    '''
+    conflicts = []
+    for groups in (data['conflict1'],data['conflict2'],data['conflict3']):
+        # convert to python list (allow space or comma separated lists)
+        items = groups.replace(',',' ').split()
+        conflicts.extend(items)
+    return conflicts
+
+# -------------------------------------------------
+# Forms
+# -------------------------------------------------
+
+class GroupSelectForm(forms.Form):
+    group = forms.ChoiceField()
+    
+    def __init__(self,*args,**kwargs):
+        choices = kwargs.pop('choices')
+        super(GroupSelectForm, self).__init__(*args,**kwargs)
+        self.fields['group'].widget.choices = choices
+
+
+class SessionForm(forms.Form):
+    num_session = forms.ChoiceField(choices=NUM_SESSION_CHOICES)
+    length_session1 = forms.ChoiceField(choices=LENGTH_SESSION_CHOICES)
+    length_session2 = forms.ChoiceField(choices=LENGTH_SESSION_CHOICES,required=False)
+    length_session3 = forms.ChoiceField(choices=LENGTH_SESSION_CHOICES,required=False)
+    attendees = forms.IntegerField()
+    conflict1 = forms.CharField(max_length=255,required=False)
+    conflict2 = forms.CharField(max_length=255,required=False)
+    conflict3 = forms.CharField(max_length=255,required=False)
+    comments = forms.CharField(max_length=200,required=False)
+    wg_selector1 = forms.ChoiceField(choices=WG_CHOICES,required=False)
+    wg_selector2 = forms.ChoiceField(choices=WG_CHOICES,required=False)
+    wg_selector3 = forms.ChoiceField(choices=WG_CHOICES,required=False)
+    third_session = forms.BooleanField(required=False)
+
+    def __init__(self, *args, **kwargs):
+        super(SessionForm, self).__init__(*args, **kwargs)
+        self.fields['num_session'].widget.attrs['onChange'] = "stat_ls(this.selectedIndex);"
+        self.fields['length_session1'].widget.attrs['onClick'] = "if (check_num_session(1)) this.disabled=true;"
+        self.fields['length_session2'].widget.attrs['onClick'] = "if (check_num_session(2)) this.disabled=true;"
+        self.fields['length_session3'].widget.attrs['onClick'] = "if (check_third_session()) { this.disabled=true;}"
+        self.fields['comments'].widget = forms.Textarea(attrs={'rows':'6','cols':'65'})
+        self.fields['wg_selector1'].widget.attrs['onChange'] = "document.form_post.conflict1.value=document.form_post.conflict1.value + ' ' + this.options[this.selectedIndex].value; return handleconflictfield(1);"
+        self.fields['wg_selector2'].widget.attrs['onChange'] = "document.form_post.conflict2.value=document.form_post.conflict2.value + ' ' + this.options[this.selectedIndex].value; return handleconflictfield(2);"
+        self.fields['wg_selector2'].widget.attrs['onClick'] = "return check_prior_conflict(2);"
+        self.fields['wg_selector3'].widget.attrs['onChange'] = "document.form_post.conflict3.value=document.form_post.conflict3.value + ' ' + this.options[this.selectedIndex].value; return handleconflictfield(3);"
+        self.fields['wg_selector3'].widget.attrs['onClick'] = "return check_prior_conflict(3);"
+        self.fields['third_session'].widget.attrs['onClick'] = "if (document.form_post.num_session.selectedIndex < 2) { alert('Cannot use this field - Number of Session is not set to 2'); return false; } else { if (this.checked==true) { document.form_post.length_session3.disabled=false; } else { document.form_post.length_session3.value=0;document.form_post.length_session3.disabled=true; } }"
+        
+        # check third_session checkbox if instance and length_session3
+        # assert False, (self.instance, self.fields['length_session3'].initial)
+        if self.initial and 'length_session3' in self.initial:
+            if self.initial['length_session3'] != '0' and self.initial['length_session3'] != None:
+                self.fields['third_session'].initial = True
+                
+    def clean_conflict1(self):
+        conflict = self.cleaned_data['conflict1']
+        check_conflict(conflict)
+        return conflict
+    
+    def clean_conflict2(self):
+        conflict = self.cleaned_data['conflict2']
+        check_conflict(conflict)
+        return conflict
+    
+    def clean_conflict3(self):
+        conflict = self.cleaned_data['conflict3']
+        check_conflict(conflict)
+        return conflict
+    
+    def clean(self):
+        super(SessionForm, self).clean()
+        data = self.cleaned_data
+        if self.errors:
+            return self.cleaned_data
+            
+        # error if conflits contain dupes
+        all_conflicts = join_conflicts(data)
+        temp = []
+        for c in all_conflicts:
+            if c not in temp:
+                temp.append(c)
+            else:
+                raise forms.ValidationError('%s appears in conflicts more than once' % c)
+        
+        # verify session_length and num_session correspond
+        # if default (empty) option is selected, cleaned_data won't include num_session key
+        if data.get('num_session','') == 2:
+            if not data['length_session2']:
+                raise forms.ValidationError('You must enter a length for session 2')
+        
+        if data.get('third_session',False):
+            if not data.get('length_session3',None):
+                raise forms.ValidationError('Length of third session not selected')
+        
+        return data
+        
+class ToolStatusForm(forms.Form):
+    message = forms.CharField(widget=forms.Textarea(attrs={'rows':'3','cols':'80'}))
+    

ietf/secr/sreq/__init__.py

@@ -0,0 +1 @@
+from django.db import models

ietf/secr/sreq/forms.py

@@ -0,0 +1,82 @@
+from django.core.urlresolvers import reverse
+from django.test import TestCase
+from django.contrib.auth.models import User
+
+from ietf.group.models import Group
+from ietf.ietfauth.decorators import has_role
+
+from pyquery import PyQuery
+
+SEC_USER='rcross'
+WG_USER=''
+AD_USER=''
+
+class MainTestCase(TestCase):
+    fixtures = ['names', 
+                'test-meeting',
+                'test-group',
+                'test-person',
+                'test-user',
+                'test-email',
+                'test-role']
+    
+    # ------- Test View -------- #
+    def test_main(self):
+        url = reverse('sessions')
+        r = self.client.get(url,REMOTE_USER=SEC_USER)
+        self.assertEquals(r.status_code, 200)
+        #assert False, (r.context)
+        sched = r.context['scheduled_groups']
+        unsched = r.context['unscheduled_groups']
+        self.failUnless(len(sched) == 0)
+        self.failUnless(len(unsched) == 5)
+        #ancp = Group.objects.get(acronym='ancp')
+        paws = Group.objects.get(acronym='paws')
+        #self.failUnless(ancp in sched)
+        self.failUnless(paws in unsched)
+        #assert False, r.content
+        #user = User.objects.get(username='rcross')
+        #self.failUnless(has_role(user,'Secretariat'))
+
+class SubmitRequestCase(TestCase):
+    fixtures = ['names', 
+                'test-meeting',
+                'test-group',
+                'test-person',
+                'test-user',
+                'test-email',
+                'test-role']
+    
+    def test_submit_request(self):
+        url = reverse('sessions_new',kwargs={'acronym':'ancp'})
+        post_data = {'id_num_session':'1',
+                     'id_length_session1':'3600',
+                     'id_attendees':'10',
+                     'id_conflict1':'core',
+                     'id_comments':'need projector'}
+        self.client.login(remote_user='rcross')
+        r = self.client.post(url,post_data)
+        self.assertEquals(r.status_code, 200)
+        #assert False, self.client.session..__dict__
+        
+        url = reverse('sessions_confirm',kwargs={'acronym':'ancp'})
+        #s = self.client.session
+        #s['session_form'] = post_data
+        r = self.client.get(url)
+        assert False, r.content
+
+class EditRequestCase(TestCase):
+    pass
+    
+class NotMeetingCase(TestCase):
+    pass
+
+class RetrievePreviousCase(TestCase):
+    pass
+
+
+
+    # test error if already scheduled
+    # test get previous exists/doesn't exist
+    # test that groups scheduled and unscheduled add up to total groups
+    # test locking function, access by unauthorized

ietf/secr/sreq/models.py

@@ -0,0 +1,13 @@
+from django.conf.urls.defaults import *
+
+urlpatterns = patterns('sec.sreq.views',
+    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<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'),
+    url(r'^(?P<acronym>[A-Za-z0-9_\-\+]+)/edit/$', 'edit', name='sessions_edit'),
+    url(r'^(?P<acronym>[A-Za-z0-9_\-\+]+)/new/$', 'new', name='sessions_new'),
+    url(r'^(?P<acronym>[A-Za-z0-9_\-\+]+)/no_session/$', 'no_session', name='sessions_no_session'),
+)