diff --git a/PyRIGS/settings.py b/PyRIGS/settings.py index 9a9fefda..a13dabb4 100644 --- a/PyRIGS/settings.py +++ b/PyRIGS/settings.py @@ -138,4 +138,4 @@ TEMPLATE_DIRS = ( os.path.join(BASE_DIR, 'templates'), ) -TERMS_OF_HIRE_URL = "http://www.nottinghamtec.co.uk/pdf/terms.pdf" \ No newline at end of file +TERMS_OF_HIRE_URL = "http://dev.nottinghamtec.co.uk/wp-content/uploads/2014/11/terms.pdf" \ No newline at end of file diff --git a/RIGS/importer.py b/RIGS/importer.py index 0a8bbbe5..01f1989e 100644 --- a/RIGS/importer.py +++ b/RIGS/importer.py @@ -63,7 +63,7 @@ def import_people(delete=False): resp = cursor.fetchall() for row in resp: email = row[3] - if email is not "" and "@" not in email: + if (email is not None) and ("@" not in email): email += "@nottingham.ac.uk" notes = "" diff --git a/db.sqlite3 b/db.sqlite3 index 7ab8dcb2..5300e8cb 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/requirements.txt b/requirements.txt index fdba806a..a8c14984 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,6 +6,7 @@ django-reversion==1.8.5 sqlparse==0.1.13 simplejson==3.6.5 lxml==3.4.1 -pil==1.1.7 +pillow==2.7.0 +reportlab==2.7 z3c.rml==2.7.2 pyPDF2==1.23