diff --git a/ietf/secr/rolodex/models.py b/ietf/secr/rolodex/models.py index 137941ffa..8b1378917 100644 --- a/ietf/secr/rolodex/models.py +++ b/ietf/secr/rolodex/models.py @@ -1 +1 @@ -from django.db import models + diff --git a/ietf/secr/rolodex/tests.py b/ietf/secr/rolodex/tests.py index 307c9b87a..fb73c5e14 100644 --- a/ietf/secr/rolodex/tests.py +++ b/ietf/secr/rolodex/tests.py @@ -1,10 +1,9 @@ from django.core.urlresolvers import reverse -from ietf.utils import TestCase +from ietf.utils import TestCase from ietf.person.models import Person from ietf.utils.test_data import make_test_data -from pyquery import PyQuery SECR_USER='secretary' @@ -17,7 +16,7 @@ class MainTestCase(TestCase): def test_view(self): "View Test" - draft = make_test_data() + make_test_data() person = Person.objects.all()[0] url = reverse('rolodex_view', kwargs={'id':person.id}) response = self.client.get(url, REMOTE_USER=SECR_USER) diff --git a/ietf/secr/rolodex/urls.py b/ietf/secr/rolodex/urls.py index 4ef5d4901..dcf7d6778 100644 --- a/ietf/secr/rolodex/urls.py +++ b/ietf/secr/rolodex/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import * +from django.conf.urls import patterns, url urlpatterns = patterns('ietf.secr.rolodex.views', url(r'^$', 'search', name='rolodex'), diff --git a/ietf/secr/rolodex/views.py b/ietf/secr/rolodex/views.py index cfe3e5766..38d72d17d 100644 --- a/ietf/secr/rolodex/views.py +++ b/ietf/secr/rolodex/views.py @@ -1,16 +1,14 @@ from django.contrib import messages -from django.core.urlresolvers import reverse +from django.contrib.auth.models import User from django.db import IntegrityError -from django.db.models import Q -from django.forms.formsets import formset_factory -from django.forms.models import inlineformset_factory, modelformset_factory +from django.forms.models import inlineformset_factory from django.http import HttpResponseRedirect from django.shortcuts import render_to_response, get_object_or_404, redirect from django.template import RequestContext from ietf.person.models import Person, Email, Alias +from ietf.secr.rolodex.forms import EditPersonForm, EmailForm, NameForm, NewPersonForm, SearchForm -from forms import * # --------------------------------------- # Views