|
| 1 | +import datetime |
| 2 | +import os |
| 3 | + |
1 | 4 | from django.conf import settings |
2 | 5 | from django.contrib import messages |
3 | | -from django.core.exceptions import ObjectDoesNotExist |
4 | | -from django.core.urlresolvers import reverse |
5 | 6 | from django.db.models import Q |
6 | | -from django.http import HttpResponse, HttpResponseRedirect, Http404 |
| 7 | +from django.http import Http404 |
7 | 8 | from django.shortcuts import render_to_response, get_object_or_404, redirect |
8 | 9 | from django.template import RequestContext |
9 | 10 |
|
10 | | -from ietf.secr.utils.mail import get_ad_email_list, get_chair_email_list, get_cc_list |
11 | | -from ietf.secr.utils.decorators import check_permissions, sec_only |
12 | | -from ietf.secr.utils.group import get_my_groups, groups_by_session |
13 | | - |
| 11 | +from ietf.group.models import Group |
14 | 12 | from ietf.ietfauth.utils import has_role |
15 | | -from ietf.utils.mail import send_mail |
16 | 13 | from ietf.meeting.models import Meeting, Session, Constraint |
17 | | - |
18 | | -from ietf.group.models import Group, Role |
19 | 14 | from ietf.name.models import SessionStatusName, ConstraintName |
20 | | - |
21 | | -from forms import * |
22 | | - |
23 | | -from itertools import chain |
24 | | -import datetime |
25 | | -import itertools |
| 15 | +from ietf.secr.sreq.forms import SessionForm, GroupSelectForm, ToolStatusForm |
| 16 | +from ietf.secr.utils.decorators import check_permissions, sec_only |
| 17 | +from ietf.secr.utils.group import groups_by_session |
| 18 | +from ietf.secr.utils.mail import get_ad_email_list, get_chair_email_list, get_cc_list |
| 19 | +from ietf.utils.mail import send_mail |
26 | 20 |
|
27 | 21 | # ------------------------------------------------- |
28 | 22 | # Globals |
@@ -150,7 +144,7 @@ def send_notification(group,meeting,login,session,action): |
150 | 144 | cc_list.append(login.role_email(role_name='wg').address) |
151 | 145 | subject = '%s - Request for meeting session approval for IETF %s' % (group.acronym, meeting.number) |
152 | 146 | template = 'sreq/session_approval_notification.txt' |
153 | | - status_text = 'the %s Directors for approval' % group.parent |
| 147 | + #status_text = 'the %s Directors for approval' % group.parent |
154 | 148 | send_mail(None, |
155 | 149 | to_email, |
156 | 150 | from_email, |
@@ -482,7 +476,6 @@ def new(request, acronym): |
482 | 476 | group = get_object_or_404(Group, acronym=acronym) |
483 | 477 | meeting = get_meeting() |
484 | 478 | session_conflicts = session_conflicts_as_string(group, meeting) |
485 | | - user = request.user |
486 | 479 |
|
487 | 480 | if request.method == 'POST': |
488 | 481 | button_text = request.POST.get('submit', '') |
|
0 commit comments