fix pyflakes error. work on interim request ui

- Legacy-Id: 10887
This commit is contained in:
Ryan Cross 2016-03-03 18:50:37 +00:00
parent 269547a757
commit 0ada59cd08
3 changed files with 18 additions and 14 deletions

View file

@ -2,6 +2,7 @@ import datetime
import re
from django import forms
from django.core.validators import ValidationError
from django.forms.fields import Field
from django.utils.encoding import force_text
from django.utils import six

View file

@ -358,20 +358,14 @@ class InterimTests(TestCase):
upcoming_url = urlreverse("ietf.meeting.views.upcoming")
request_url = urlreverse("ietf.meeting.views.interim_request")
r = self.client.get(upcoming_url)
self.assertEqual(r.status_code, 200)
q = PyQuery(r.content)
self.assertEqual(len(q("a.btn:contains('Request new interim meeting')")), 0)
self.assertNotContains(r,'Request new interim meeting')
r = self.client.get(request_url)
self.assertEqual(r.status_code, 302)
redirect_url = 'http://testserver' + "/accounts/login/?next=/meeting/interim/request/"
self.assertEqual(r['location'],redirect_url)
self.assertRedirects(r, '/accounts/login/?next=/meeting/interim/request/')
# test authorized
self.client.login(username="secretary", password="secretary+password")
r = self.client.get(upcoming_url)
self.assertEqual(r.status_code, 200)
q = PyQuery(r.content)
self.assertEqual(len(q("a.btn:contains('Request new interim meeting')")), 1)
self.assertContains(r,'Request new interim meeting')
r = self.client.get(request_url)
self.assertEqual(r.status_code, 200)
@ -413,9 +407,7 @@ class InterimTests(TestCase):
r = self.client.post(urlreverse("ietf.meeting.views.interim_request"),data)
self.assertEqual(r.status_code,302)
redirect_url = 'http://testserver' + urlreverse("ietf.meeting.views.upcoming")
self.assertEqual(r['location'],redirect_url)
self.assertRedirects(r,urlreverse('ietf.meeting.views.upcoming'))
meeting = Meeting.objects.order_by('id').last()
self.assertEqual(meeting.type_id,'interim')
self.assertEqual(meeting.date,date)

View file

@ -9,10 +9,21 @@
{% origin %}
<h1>Interim Meeting Request</h1>
<form method="post">
<form method="post" class="form-horizontal">
{% csrf_token %}
{% bootstrap_form form %}
{% bootstrap_field form.group layout='horizontal' %}
<div class="form-group">
<label for="session" class="col-md-2 control-label">Session</label>
<div class="col-md-10">
<div class="form-inline">
{% bootstrap_field form.date show_label=False %}
{% bootstrap_field form.time show_label=False %}
{% bootstrap_field form.duration show_label=False %}
</div>
</div>
</div>
{% buttons %}
<button type="submit" class="btn btn-primary">Submit</button>