diff --git a/ietf/secr/areas/models.py b/ietf/secr/areas/models.py index 137941ffa..8b1378917 100644 --- a/ietf/secr/areas/models.py +++ b/ietf/secr/areas/models.py @@ -1 +1 @@ -from django.db import models + diff --git a/ietf/secr/areas/tests.py b/ietf/secr/areas/tests.py index 3ad9692c4..44addba00 100644 --- a/ietf/secr/areas/tests.py +++ b/ietf/secr/areas/tests.py @@ -1,15 +1,10 @@ from django.core.urlresolvers import reverse -from ietf.utils import TestCase -from django.contrib.auth.models import User from ietf.group.models import Group, GroupEvent -from ietf.ietfauth.utils import has_role from ietf.person.models import Person +from ietf.utils import TestCase from ietf.utils.test_data import make_test_data -from pyquery import PyQuery - -import datetime SECR_USER='secretary' @@ -23,14 +18,14 @@ def augment_data(): class MainTestCase(TestCase): def test_main(self): "Main Test" - draft = make_test_data() + make_test_data() url = reverse('areas') response = self.client.get(url, REMOTE_USER=SECR_USER) self.assertEqual(response.status_code, 200) def test_view(self): "View Test" - draft = make_test_data() + make_test_data() augment_data() areas = Group.objects.filter(type='area',state='active') url = reverse('areas_view', kwargs={'name':areas[0].acronym}) diff --git a/ietf/secr/areas/urls.py b/ietf/secr/areas/urls.py index 7c08928e7..8ce16bd5a 100644 --- a/ietf/secr/areas/urls.py +++ b/ietf/secr/areas/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import * +from django.conf.urls import patterns, url urlpatterns = patterns('ietf.secr.areas.views', url(r'^$', 'list_areas', name='areas'), diff --git a/ietf/secr/areas/views.py b/ietf/secr/areas/views.py index fd5ed17bf..79cfb6e12 100644 --- a/ietf/secr/areas/views.py +++ b/ietf/secr/areas/views.py @@ -1,21 +1,18 @@ +import datetime +import json + from django.contrib import messages -from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned -from django.core.urlresolvers import reverse from django.forms.formsets import formset_factory -from django.forms.models import inlineformset_factory, modelformset_factory -from django.http import HttpResponseRedirect, HttpResponse +from django.forms.models import inlineformset_factory +from django.http import HttpResponse from django.shortcuts import render_to_response, get_object_or_404, redirect from django.template import RequestContext -from ietf.group.models import Group, GroupEvent, GroupURL, Role +from ietf.group.models import Group, GroupEvent, GroupURL, Role, ChangeStateGroupEvent from ietf.group.utils import save_group_in_history -from ietf.name.models import RoleName -from ietf.person.models import Person, Email -from forms import * +from ietf.person.models import Person +from ietf.secr.areas.forms import AWPAddModelForm, AWPForm, AddAreaModelForm, AreaDirectorForm, AreaForm -import re -import json - # -------------------------------------------------- # AJAX FUNCTIONS # --------------------------------------------------