From f2fbb92f4294be3d101f3640e60e77b682da7cce Mon Sep 17 00:00:00 2001 From: Frank Wiles Date: Wed, 7 May 2014 09:05:06 -0500 Subject: [PATCH] Merge fixes --- AUTHORS.txt | 3 ++- tos/models.py | 2 -- tos/urls.py | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/AUTHORS.txt b/AUTHORS.txt index 9f2e772..6c68353 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -3,5 +3,6 @@ django-tos is a Revolution Systems (http://www.revsys.com/) project. The following is a list of much appreciated contributors: Daniel Greenfeld -Frank Wiles +Frank Wiles Krzysztof Dorosz +akuryou diff --git a/tos/models.py b/tos/models.py index 1536f8c..34724dc 100644 --- a/tos/models.py +++ b/tos/models.py @@ -1,9 +1,7 @@ from django.core.exceptions import ValidationError from django.db import models -from django.contrib.auth.models import User from django.utils.translation import ugettext_lazy as _ from django.conf import settings -from django.utils.translation import ugettext_lazy as _ class NoActiveTermsOfService(ValidationError): diff --git a/tos/urls.py b/tos/urls.py index 27cbbf4..9e3c535 100644 --- a/tos/urls.py +++ b/tos/urls.py @@ -2,9 +2,9 @@ from django.conf.urls import url, patterns from tos.views import check_tos, TosView urlpatterns = patterns('', - # Terms of Service conform + # Terms of Service conform url(r'^confirm/$', check_tos, name='tos_check_tos'), - - # Terms of service simple display + + # Terms of service simple display url(r'^$', TosView.as_view(), name='tos'), ) \ No newline at end of file