diff --git a/result_server/routes/admin.py b/result_server/routes/admin.py index 5e71d38c..d216703d 100644 --- a/result_server/routes/admin.py +++ b/result_server/routes/admin.py @@ -285,6 +285,8 @@ def _portal_result_server_url(): return configured.rstrip("/") path = request.path or "" prefix = path.split("/admin/", 1)[0] if "/admin/" in path else "" + if prefix.endswith("/console"): + prefix = prefix[: -len("/console")] if prefix == "/admin": prefix = "" return f"{request.url_root.rstrip('/')}{prefix}" diff --git a/result_server/templates/_usage_report_evidence_snapshot_section.html b/result_server/templates/_usage_report_evidence_snapshot_section.html index 2021ac31..ae19c08b 100644 --- a/result_server/templates/_usage_report_evidence_snapshot_section.html +++ b/result_server/templates/_usage_report_evidence_snapshot_section.html @@ -39,54 +39,54 @@
| Application | -System | -Configured | -Result / Quality | -Exp | -Profiled | -Estimated | -Source Status | -Input Status | -Build Cache | -Public Result | +Target | +Configuration | +Result Evidence | +Profile / Estimate | +Provenance | Next Action | -Maturity Gaps |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{ row.code }} | -{{ row.system }} | -{{ row.configured }} | ++ {{ row.code }} + {{ row.system }} + | ++ {{ row.configured }} + {{ row.configured_status }} + | {% if row.latest_result_file %} {{ row.latest_result_time }} {% else %} - {% endif %} - {{ row.latest_result_status }} - | -{{ row.latest_result_exp }} | -- {{ row.profiled }} - {{ row.latest_profile_time }} + Quality: {{ row.latest_result_status }} + Exp: {{ row.latest_result_exp }} / Public: {{ row.public_result_available }} | + Profiled {{ row.profiled }} + Latest: {{ row.latest_profile_time }} + Estimated {% if row.latest_estimate_file %} {{ row.estimated }} {% else %} {{ row.estimated }} {% endif %} - {{ row.estimate_applicability }} + Applicability: {{ row.estimate_applicability }} + | ++ Source {{ row.source_status }} + Input {{ row.input_status }} + Build Cache {{ row.build_cache_status }} + | ++ {{ row.next_action }} + Maturity Gaps: {{ row.missing_reason }} | -{{ row.source_status }} | -{{ row.input_status }} | -{{ row.build_cache_status }} | -{{ row.public_result_available }} | -{{ row.next_action }} | -{{ row.missing_reason }} |