Skip to content
Snippets Groups Projects
Commit f4d19fdd authored by Jan Mach's avatar Jan Mach
Browse files

Fix: Fixed error in code flow.

(Redmine issue: #6232)
parent ee01ef40
No related branches found
No related tags found
No related merge requests found
......@@ -1603,6 +1603,36 @@ class BaseSearchView(RenderableView, HawatUtils):
label = 'Done searching for "{}", items found: {}'.format(flask.request.full_path, len(items)),
log = True
)
self.response_context.update(
searched = True,
items = items,
items_count = len(items),
form_data = form_data
)
# Not all search forms support result paging.
if 'page' in form_data:
self.response_context.update(
pager_index_low = ((form_data['page'] - 1) * form_data['limit']) + 1,
pager_index_high = ((form_data['page'] - 1) * form_data['limit']) + len(items),
pager_index_limit = ((form_data['page'] - 1) * form_data['limit']) + form_data['limit']
)
self.mark_time(
'postprocess_begin',
tag = 'search',
label = 'Begin postprocessing for "{}"'.format(flask.request.full_path),
log = True
)
self.do_after_search(items)
self.mark_time(
'postprocess_end',
tag = 'search',
label = 'Done postprocessing for "{}"'.format(flask.request.full_path),
log = True
)
except Exception as err: # pylint: disable=locally-disabled,broad-except
match = re.match('invalid IP4R value: "([^"]+)"', str(err))
if match:
......@@ -1618,34 +1648,6 @@ class BaseSearchView(RenderableView, HawatUtils):
else:
raise
self.response_context.update(
searched = True,
items = items,
items_count = len(items),
form_data = form_data
)
# Not all search forms support result paging.
if 'page' in form_data:
self.response_context.update(
pager_index_low = ((form_data['page'] - 1) * form_data['limit']) + 1,
pager_index_high = ((form_data['page'] - 1) * form_data['limit']) + len(items),
pager_index_limit = ((form_data['page'] - 1) * form_data['limit']) + form_data['limit']
)
self.mark_time(
'postprocess_begin',
tag = 'search',
label = 'Begin postprocessing for "{}"'.format(flask.request.full_path),
log = True
)
self.do_after_search(items)
self.mark_time(
'postprocess_end',
tag = 'search',
label = 'Done postprocessing for "{}"'.format(flask.request.full_path),
log = True
)
else:
self.response_context.update(
form_errors = [(field_name, err) for field_name, error_messages in form.errors.items() for err in error_messages]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment