From edbb8286146920583087080809f6e904ca856cc9 Mon Sep 17 00:00:00 2001
From: Wojtek Kosior <koszko@koszko.org>
Date: Thu, 25 Aug 2022 10:18:33 +0200
Subject: [proxy] make package version info page also display other versions;
 fix&improve some aspects of package loading and dependency recomputing

---
 .../proxy/web_ui/templates/packages/index.html.jinja         | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/hydrilla/proxy/web_ui/templates/packages/index.html.jinja')

diff --git a/src/hydrilla/proxy/web_ui/templates/packages/index.html.jinja b/src/hydrilla/proxy/web_ui/templates/packages/index.html.jinja
index bac774e..cbdd3d9 100644
--- a/src/hydrilla/proxy/web_ui/templates/packages/index.html.jinja
+++ b/src/hydrilla/proxy/web_ui/templates/packages/index.html.jinja
@@ -35,11 +35,15 @@ in a proprietary work, I am not going to enforce this in court.
 	  <div>
 	    {{ info.identifier }}
 	  </div>
-	  {% if info.active_version_ref is not none %}
+	  {%-
+	    if info.active_version is not none and
+	        info.active_version.active == ActiveStatus.REQUIRED
+	  %}
+	    {%- set ver      = info.active_version.info.version %}
+	    {%- set ver_str  = versions.version_string(ver) %}
+	    {%- set ver_desc = ver_str + '@' + info.active_version.info.repo %}
 	    <div class="small-print">
-	      {{ versions.version_string(info.active_version_info.version) }}
-	      @
-	      {{ info.active_version_info.repo }}
+	      {{ _('web_ui.packages.enabled_version_{}').format(ver_desc) }}
 	    </div>
 	  {% endif %}
 	</a>
-- 
cgit v1.2.3