From 4e6b7479e66f065893b71763e41ac492ba08ddd3 Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Mon, 15 May 2023 10:02:11 +0200 Subject: [PATCH 1/2] fixed breaking condition --- caimira/apps/calculator/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caimira/apps/calculator/__init__.py b/caimira/apps/calculator/__init__.py index eae04be7..cecdf449 100644 --- a/caimira/apps/calculator/__init__.py +++ b/caimira/apps/calculator/__init__.py @@ -383,7 +383,7 @@ def make_app( ] interface: str = os.environ.get('CAIMIRA_THEME', '') - if interface != '' and (interface != '' or 'cern' not in interface): urls = list(filter(lambda i: i in base_urls, urls)) + if interface != '' and (interface != '' and 'cern' not in interface): urls = list(filter(lambda i: i in base_urls, urls)) # Any extra generic page must be declared in the env. variable "EXTRA_PAGES" extra_pages: typing.Union[str, typing.List] = os.environ.get('EXTRA_PAGES', []) From ce99afb965c67d715133a5feb8a0939c49ddb42b Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Mon, 15 May 2023 10:23:14 +0200 Subject: [PATCH 2/2] added static url to base urls --- caimira/apps/calculator/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caimira/apps/calculator/__init__.py b/caimira/apps/calculator/__init__.py index cecdf449..4a410646 100644 --- a/caimira/apps/calculator/__init__.py +++ b/caimira/apps/calculator/__init__.py @@ -363,12 +363,12 @@ def make_app( (get_root_url(r'/?'), LandingPage), (get_root_calculator_url(r'/?'), CalculatorForm), (get_root_calculator_url(r'/report'), ConcentrationModel), + (get_root_url(r'/static/(.*)'), StaticFileHandler, {'path': static_dir}), (get_root_calculator_url(r'/static/(.*)'), StaticFileHandler, {'path': calculator_static_dir}), ] urls: typing.List = base_urls + [ (get_root_url(r'/_c/(.*)'), CompressedCalculatorFormInputs), - (get_root_url(r'/static/(.*)'), StaticFileHandler, {'path': static_dir}), (get_root_calculator_url(r'/report-json'), ConcentrationModelJsonResponse), (get_root_calculator_url(r'/baseline-model/result'), StaticModel), (get_root_calculator_url(r'/api/arve/v1/(.*)/(.*)'), ArveData),