Made ietf/secr/sreq pyflakes-clean.
- Legacy-Id: 7491
This commit is contained in:
parent
0b65b383f8
commit
c4c8effcde
|
@ -1,7 +1,7 @@
|
|||
from django import forms
|
||||
|
||||
from ietf.group.models import Group
|
||||
import os
|
||||
|
||||
|
||||
# -------------------------------------------------
|
||||
# Globals
|
||||
|
|
|
@ -1 +1 @@
|
|||
from django.db import models
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
from django import template
|
||||
from ietf.person.models import Person
|
||||
import datetime
|
||||
|
||||
|
||||
register = template.Library()
|
||||
|
||||
|
@ -63,7 +63,7 @@ def smart_login(user):
|
|||
Expects a Person object. If person is a Secretariat returns "on behalf of the"
|
||||
'''
|
||||
if not isinstance (user, Person):
|
||||
return value
|
||||
return user
|
||||
if user.role_set.filter(name='secr',group__acronym='secretariat'):
|
||||
return '%s, on behalf of the' % user
|
||||
else:
|
||||
|
|
|
@ -1,10 +1,7 @@
|
|||
from django.conf import settings
|
||||
from django.contrib.auth.models import User
|
||||
from django.core.urlresolvers import reverse
|
||||
|
||||
from ietf.utils import TestCase
|
||||
from ietf.group.models import Group
|
||||
from ietf.ietfauth.utils import has_role
|
||||
from ietf.utils.test_data import make_test_data
|
||||
|
||||
#from pyquery import PyQuery
|
||||
|
@ -26,7 +23,7 @@ class SreqUrlTests(TestCase):
|
|||
|
||||
class MainTestCase(TestCase):
|
||||
def test_main(self):
|
||||
draft = make_test_data()
|
||||
make_test_data()
|
||||
url = reverse('sessions')
|
||||
r = self.client.get(url, REMOTE_USER=SECR_USER)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
|
@ -37,7 +34,7 @@ class MainTestCase(TestCase):
|
|||
|
||||
class SubmitRequestCase(TestCase):
|
||||
def test_submit_request(self):
|
||||
draft = make_test_data()
|
||||
make_test_data()
|
||||
acronym = Group.objects.all()[0].acronym
|
||||
url = reverse('sessions_new',kwargs={'acronym':acronym})
|
||||
post_data = {'id_num_session':'1',
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
from django.conf.urls import *
|
||||
from django.conf.urls import patterns, url
|
||||
|
||||
urlpatterns = patterns('ietf.secr.sreq.views',
|
||||
url(r'^$', 'main', name='sessions'),
|
||||
|
|
|
@ -1,28 +1,22 @@
|
|||
import datetime
|
||||
import os
|
||||
|
||||
from django.conf import settings
|
||||
from django.contrib import messages
|
||||
from django.core.exceptions import ObjectDoesNotExist
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.db.models import Q
|
||||
from django.http import HttpResponse, HttpResponseRedirect, Http404
|
||||
from django.http import Http404
|
||||
from django.shortcuts import render_to_response, get_object_or_404, redirect
|
||||
from django.template import RequestContext
|
||||
|
||||
from ietf.secr.utils.mail import get_ad_email_list, get_chair_email_list, get_cc_list
|
||||
from ietf.secr.utils.decorators import check_permissions, sec_only
|
||||
from ietf.secr.utils.group import get_my_groups, groups_by_session
|
||||
|
||||
from ietf.group.models import Group
|
||||
from ietf.ietfauth.utils import has_role
|
||||
from ietf.utils.mail import send_mail
|
||||
from ietf.meeting.models import Meeting, Session, Constraint
|
||||
|
||||
from ietf.group.models import Group, Role
|
||||
from ietf.name.models import SessionStatusName, ConstraintName
|
||||
|
||||
from forms import *
|
||||
|
||||
from itertools import chain
|
||||
import datetime
|
||||
import itertools
|
||||
from ietf.secr.sreq.forms import SessionForm, GroupSelectForm, ToolStatusForm
|
||||
from ietf.secr.utils.decorators import check_permissions, sec_only
|
||||
from ietf.secr.utils.group import groups_by_session
|
||||
from ietf.secr.utils.mail import get_ad_email_list, get_chair_email_list, get_cc_list
|
||||
from ietf.utils.mail import send_mail
|
||||
|
||||
# -------------------------------------------------
|
||||
# Globals
|
||||
|
@ -150,7 +144,7 @@ def send_notification(group,meeting,login,session,action):
|
|||
cc_list.append(login.role_email(role_name='wg').address)
|
||||
subject = '%s - Request for meeting session approval for IETF %s' % (group.acronym, meeting.number)
|
||||
template = 'sreq/session_approval_notification.txt'
|
||||
status_text = 'the %s Directors for approval' % group.parent
|
||||
#status_text = 'the %s Directors for approval' % group.parent
|
||||
send_mail(None,
|
||||
to_email,
|
||||
from_email,
|
||||
|
@ -482,7 +476,6 @@ def new(request, acronym):
|
|||
group = get_object_or_404(Group, acronym=acronym)
|
||||
meeting = get_meeting()
|
||||
session_conflicts = session_conflicts_as_string(group, meeting)
|
||||
user = request.user
|
||||
|
||||
if request.method == 'POST':
|
||||
button_text = request.POST.get('submit', '')
|
||||
|
|
Loading…
Reference in a new issue