Commit 95ca1e6a authored by Ozzieisaacs's avatar Ozzieisaacs

Fix for #1319

parent 24c743d2
This diff is collapsed.
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
from __future__ import division, print_function, unicode_literals from __future__ import division, print_function, unicode_literals
import os import os
import base64 import base64
import datetime from datetime import datetime
import json import json
import mimetypes import mimetypes
import traceback import traceback
...@@ -967,14 +967,14 @@ def advanced_search(): ...@@ -967,14 +967,14 @@ def advanced_search():
if pub_start: if pub_start:
try: try:
searchterm.extend([_(u"Published after ") + searchterm.extend([_(u"Published after ") +
format_date(datetime.datetime.strptime(pub_start, "%Y-%m-%d"), format_date(datetime.strptime(pub_start, "%Y-%m-%d"),
format='medium', locale=get_locale())]) format='medium', locale=get_locale())])
except ValueError: except ValueError:
pub_start = u"" pub_start = u""
if pub_end: if pub_end:
try: try:
searchterm.extend([_(u"Published before ") + searchterm.extend([_(u"Published before ") +
format_date(datetime.datetime.strptime(pub_end, "%Y-%m-%d"), format_date(datetime.strptime(pub_end, "%Y-%m-%d"),
format='medium', locale=get_locale())]) format='medium', locale=get_locale())])
except ValueError: except ValueError:
pub_start = u"" pub_start = u""
...@@ -1358,7 +1358,7 @@ def verify_token(token): ...@@ -1358,7 +1358,7 @@ def verify_token(token):
return redirect(url_for('web.index')) return redirect(url_for('web.index'))
# Token expired # Token expired
if datetime.datetime.now() > auth_token.expiration: if datetime.now() > auth_token.expiration:
ub.session.delete(auth_token) ub.session.delete(auth_token)
ub.session.commit() ub.session.commit()
...@@ -1390,7 +1390,7 @@ def token_verified(): ...@@ -1390,7 +1390,7 @@ def token_verified():
data['message'] = _(u"Token not found") data['message'] = _(u"Token not found")
# Token expired # Token expired
elif datetime.datetime.now() > auth_token.expiration: elif datetime.now() > auth_token.expiration:
ub.session.delete(auth_token) ub.session.delete(auth_token)
ub.session.commit() ub.session.commit()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment