From 0b03efc73eb38283cfc506fc8c1763eed9054573 Mon Sep 17 00:00:00 2001 From: elena Date: Tue, 15 Nov 2022 08:58:57 +0000 Subject: [PATCH] changes recommended by evilham --- custom.sample/menu/system.yaml | 3 +-- dd-sso/docker/api/src/api/lib/menu.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/custom.sample/menu/system.yaml b/custom.sample/menu/system.yaml index 53c7be7..9ad0de8 100644 --- a/custom.sample/menu/system.yaml +++ b/custom.sample/menu/system.yaml @@ -85,8 +85,7 @@ apps_internal: icon: fa fa-file-image-o name: Fotos shortname: photos -- subdomain: none - href: https://dd.digitalitzacio-democratica.xnet-x.net/manual/ +- href: https://dd.digitalitzacio-democratica.xnet-x.net/manual/ icon: fa fa-book name: Manual shortname: manual diff --git a/dd-sso/docker/api/src/api/lib/menu.py b/dd-sso/docker/api/src/api/lib/menu.py index b376c51..65be8b2 100644 --- a/dd-sso/docker/api/src/api/lib/menu.py +++ b/dd-sso/docker/api/src/api/lib/menu.py @@ -78,7 +78,7 @@ class Menu: apps_internal = [] for app in system["apps_internal"]: - if app["subdomain"] != 'none': + if app["href"].startswith('/'): app["href"] = ( "https://" + app["subdomain"] @@ -86,7 +86,7 @@ class Menu: + application.config["DOMAIN"] + app["href"] ) - del app["subdomain"] + del app["subdomain"] apps_internal.append(app) with open(r"menu/custom.yaml") as yml: