aboutsummaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorrr-2016-06-11 11:15:47 +0200
committerrr-2016-06-11 17:36:02 +0200
commit8c952c08d0606f3e093eb6a409ce2bf12ea7e9b0 (patch)
tree7512916d2f9dcd103ceef2598298b9bda1952961 /server
parentb13f9dcb68ba5d1a677dded9c6f1cd5b2e8e6a92 (diff)
server/general: report bad field names to user
Diffstat (limited to 'server')
-rw-r--r--server/szurubooru/func/util.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/server/szurubooru/func/util.py b/server/szurubooru/func/util.py
index 908c760..b413710 100644
--- a/server/szurubooru/func/util.py
+++ b/server/szurubooru/func/util.py
@@ -4,7 +4,7 @@ import hashlib
import re
import tempfile
from contextlib import contextmanager
-from szurubooru.errors import ValidationError
+from szurubooru import errors
def get_serialization_options(ctx):
return ctx.get_param_as_list('_fields', required=False, default=None)
@@ -20,7 +20,8 @@ def serialize_entity(entity, field_factories, options):
factory = field_factories[key]
ret[key] = factory()
except KeyError:
- pass
+ raise errors.ValidationError('Invalid key: %r. Valid keys: %r.' % (
+ key, list(sorted(field_factories.keys()))))
return ret
@contextmanager
@@ -70,7 +71,7 @@ def parse_time_range(value, timezone=datetime.timezone(datetime.timedelta())):
value = value.lower()
if not value:
- raise ValidationError('Empty date format.')
+ raise errors.ValidationError('Empty date format.')
if value == 'today':
now = datetime.datetime.now(tz=timezone)
@@ -110,7 +111,7 @@ def parse_time_range(value, timezone=datetime.timezone(datetime.timedelta())):
datetime.datetime(year, month, day),
datetime.datetime(year, month, day + 1) - one_second)
- raise ValidationError('Invalid date format: %r.' % value)
+ raise errors.ValidationError('Invalid date format: %r.' % value)
def icase_unique(source):
target = []

© 2015 - 2026 Jakob L. Kreuze