Commit 624b0d8e authored by Paul Brown's avatar Paul Brown

Merge pull request #1213 from vToMy/bug_fixes

Fixed bugs
parents 5a66f8a4 405d6eac
...@@ -160,7 +160,7 @@ class BaseDateBetweenFilter(BaseFilter): ...@@ -160,7 +160,7 @@ class BaseDateBetweenFilter(BaseFilter):
Apply method is different for each back-end. Apply method is different for each back-end.
""" """
def clean(self, value): def clean(self, value):
return [datetime.datetime.strptime(range, '%Y-%m-%d') return [datetime.datetime.strptime(range, '%Y-%m-%d').date()
for range in value.split(' to ')] for range in value.split(' to ')]
def operation(self): def operation(self):
...@@ -168,7 +168,7 @@ class BaseDateBetweenFilter(BaseFilter): ...@@ -168,7 +168,7 @@ class BaseDateBetweenFilter(BaseFilter):
def validate(self, value): def validate(self, value):
try: try:
value = [datetime.datetime.strptime(range, '%Y-%m-%d') value = [datetime.datetime.strptime(range, '%Y-%m-%d').date()
for range in value.split(' to ')] for range in value.split(' to ')]
# if " to " is missing, fail validation # if " to " is missing, fail validation
# sqlalchemy's .between() will not work if end date is before start date # sqlalchemy's .between() will not work if end date is before start date
......
import os
from nose.tools import ok_, eq_, raises from nose.tools import ok_, eq_, raises
from flask import Flask, request, abort, url_for from flask import Flask, request, abort, url_for
...@@ -157,7 +159,7 @@ def test_baseview_registration(): ...@@ -157,7 +159,7 @@ def test_baseview_registration():
# Verify generated blueprint properties # Verify generated blueprint properties
eq_(bp.name, view.endpoint) eq_(bp.name, view.endpoint)
eq_(bp.url_prefix, view.url) eq_(bp.url_prefix, view.url)
eq_(bp.template_folder, 'templates/bootstrap2') eq_(bp.template_folder, os.path.join('templates', 'bootstrap2'))
eq_(bp.static_folder, view.static_folder) eq_(bp.static_folder, view.static_folder)
# Verify customizations # Verify customizations
......
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