darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-02-05 02:42:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move and rename macro.html

Browse Source 
Remove print statements
Fix code style
This commit is contained in:
Rebecca Law
2016-01-04 15:50:26 +00:00
parent ac05f6931e
commit 785c413cde
6 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/main/forms.py
View File

@@ -89,11 +89,7 @@ class AddServiceForm(Form):
service_name = StringField(validators=[DataRequired(message='Please enter your service name')]) service_name = StringField(validators=[DataRequired(message='Please enter your service name')])
def validate_service_name(self, a): def validate_service_name(self, a):
print("a {}".format(a))
print("self.service_name {}".format(self.service_name.data))
print("service_names {}".format(self.service_names))
if self.service_name.data in self.service_names: if self.service_name.data in self.service_names:
print('here')
raise ValidationError('Service name already exists') raise ValidationError('Service name already exists')

2
app/main/views/add_service.py
View File

@@ -9,7 +9,6 @@ from app.main.forms import AddServiceForm
@login_required @login_required
def add_service(): def add_service():
form = AddServiceForm(services_dao.find_all_service_names()) form = AddServiceForm(services_dao.find_all_service_names())
print("serivce_names {}".format(services_dao.find_all_service_names()))
if form.validate_on_submit(): if form.validate_on_submit():
user = users_dao.get_user_by_id(session['user_id']) user = users_dao.get_user_by_id(session['user_id'])
@@ -17,4 +16,3 @@ def add_service():
return redirect('/dashboard') return redirect('/dashboard')
else: else:
return render_template('views/add-service.html', form=form) return render_template('views/add-service.html', form=form)
§

0
app/templates/macros.html → app/templates/components/form-field.html
View File

2
app/templates/govuk_template.html
View File

@@ -1,4 +1,4 @@
{%- from "macros.html" import render_field %} {%- from "components/form-field.html" import render_field %}
{% block top_of_page %}{% endblock %} {% block top_of_page %}{% endblock %}
<!DOCTYPE html> <!DOCTYPE html>
<!--[if lt IE 9]><html class="lte-ie8" lang="{{ html_lang|default('en') }}"><![endif]--> <!--[if lt IE 9]><html class="lte-ie8" lang="{{ html_lang|default('en') }}"><![endif]-->

1
tests/app/main/dao/test_service_dao.py
View File

@@ -71,4 +71,3 @@ def test_should_return_list_of_service_names(notifications_admin, notifications_
actual = services_dao.find_all_service_names() actual = services_dao.find_all_service_names()
assert actual == expected assert actual == expected

1
tests/app/main/views/test_two_factor.py
View File

@@ -51,7 +51,6 @@ def test_should_login_user_when_multiple_valid_codes_exist(notifications_admin,
response = client.post('/two-factor', response = client.post('/two-factor',
data={'sms_code': '23456'}) data={'sms_code': '23456'})
assert response.status_code == 302 assert response.status_code == 302
print(user.id)
codes = verify_codes_dao.get_codes(user_id=user.id, code_type='sms') codes = verify_codes_dao.get_codes(user_id=user.id, code_type='sms')
# query will only return codes where code_used == False # query will only return codes where code_used == False
assert len(codes) == 0 assert len(codes) == 0