From af8d9123e1ffb4e239f126e07ba3fc2952eb99d1 Mon Sep 17 00:00:00 2001 From: Gwendolyn Date: Thu, 21 Dec 2023 00:42:29 +0100 Subject: [PATCH] show route options again --- src/c3nav/routing/api/routing.py | 6 ++++-- src/c3nav/site/static/site/js/c3nav.js | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/c3nav/routing/api/routing.py b/src/c3nav/routing/api/routing.py index 1c4aa5c1..bf31da2c 100644 --- a/src/c3nav/routing/api/routing.py +++ b/src/c3nav/routing/api/routing.py @@ -1,5 +1,5 @@ from enum import StrEnum -from typing import Annotated, Optional, Union +from typing import Annotated, Optional, Union, Any from django.core.exceptions import ValidationError from django.urls import reverse @@ -148,6 +148,7 @@ class RouteSchema(BaseSchema): class RouteResponse(BaseSchema): request: RouteParametersSchema options: RouteOptionsSchema + options_form: Any report_issue_url: NonEmptyStr result: RouteSchema @@ -227,10 +228,11 @@ def get_route(request, parameters: RouteParametersSchema): return RouteResponse( request=parameters, options=_new_serialize_route_options(options), + options_form=options.serialize(), report_issue_url=reverse('site.report_create', kwargs={ 'origin': parameters.origin, 'destination': parameters.destination, - 'options': options.serialize_string() + 'options': options.serialize_string(), }), result=route.serialize(locations=visible_locations_for_request(request)), ) diff --git a/src/c3nav/site/static/site/js/c3nav.js b/src/c3nav/site/static/site/js/c3nav.js index cbf139db..b77a8422 100644 --- a/src/c3nav/site/static/site/js/c3nav.js +++ b/src/c3nav/site/static/site/js/c3nav.js @@ -525,9 +525,9 @@ c3nav = { return; } $('#route-details .report').attr('href', data.report_issue_url); - c3nav._push_state({route_result: data.result, route_options: data.options}, true); + c3nav._push_state({route_result: data.result, route_options: data.options_form}, true); c3nav._display_route_result(data.result, nofly); - c3nav._display_route_options(data.options); + c3nav._display_route_options(data.options_form); }, _display_route_result: function(result, nofly) { var $route = $('#route-summary'),