From ec2b941a854c45852ada9111caf14f706fcf0a6c Mon Sep 17 00:00:00 2001 From: jebus Date: Thu, 28 Aug 2025 06:56:38 +1200 Subject: [PATCH] Fixes #60 (#66) Co-authored-by: Tim Lorsbach Reviewed-on: https://git.envipath.com/enviPath/enviPy/pulls/66 --- epdb/views.py | 7 +++++++ templates/framework.html | 28 ++++++++++++++-------------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/epdb/views.py b/epdb/views.py index 2b4ed66f..0638b166 100644 --- a/epdb/views.py +++ b/epdb/views.py @@ -150,6 +150,12 @@ def get_base_context(request, for_user=None) -> Dict[str, Any]: current_user = _anonymous_or_real(request) can_edit = editable(request, current_user) + parser = EPDBURLParser(request.build_absolute_uri(request.path)) + + url_contains_package = False + if parser.contains_package_url() or parser.is_package_url(): + url_contains_package = True + if for_user: current_user = for_user @@ -160,6 +166,7 @@ def get_base_context(request, for_user=None) -> Dict[str, Any]: 'server_url': s.SERVER_URL, 'user': current_user, 'can_edit': can_edit, + 'url_contains_package': url_contains_package, 'readable_packages': PackageManager.get_all_readable_packages(current_user, include_reviewed=True), 'writeable_packages': PackageManager.get_all_writeable_packages(current_user), 'available_groups': GroupManager.get_groups(current_user), diff --git a/templates/framework.html b/templates/framework.html index 2785c96f..0cc81936 100644 --- a/templates/framework.html +++ b/templates/framework.html @@ -197,22 +197,22 @@ {% endif %} {% block content %} {% endblock content %} - {% if meta.current_package.license %} -

-
-
-
- License + {% if meta.url_contains_package and meta.current_package.license %} +

+
+
+
+ License +
+
+
+
+ + + +
-
-
- - - -
-
-
{% endif %}