From e5a4539dcfeb1114afe4444cc12eaeda9cb17f8d Mon Sep 17 00:00:00 2001 From: Nassim Tabchiche Date: Thu, 19 Oct 2023 14:56:15 +0200 Subject: [PATCH 1/3] Fix inverted matrix legends --- core/templates/snippets/risk_matrix.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/templates/snippets/risk_matrix.html b/core/templates/snippets/risk_matrix.html index 8000f01..1731ebc 100644 --- a/core/templates/snippets/risk_matrix.html +++ b/core/templates/snippets/risk_matrix.html @@ -4,15 +4,15 @@ {% if data %}
{% for row in matrix.render_grid_as_colors reversed %} {% with row_index=forloop.revcounter0 %} {% for item in row %} @@ -34,7 +34,7 @@
- {% with impact=matrix.parse_json.impact|index:row_index %} - {{ impact.name }} + {% with probability=matrix.parse_json.probability|index:row_index %} + {{ probability.name }} {% endwith %}
-

{% trans "Probability" %}

+

{% trans "Impact" %}

{% else %}
From c94a603572cebe39f63d0bb2489655ce40771318 Mon Sep 17 00:00:00 2001 From: Nassim Tabchiche Date: Thu, 19 Oct 2023 14:58:25 +0200 Subject: [PATCH 2/3] Update VERSION --- mira/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mira/VERSION b/mira/VERSION index 3d54442..ae58dec 100644 --- a/mira/VERSION +++ b/mira/VERSION @@ -1 +1 @@ -3.0.2a +3.0.2b From a383e7d38cdb0d43ca94ae92b73e2b470c2472aa Mon Sep 17 00:00:00 2001 From: Nassim Tabchiche Date: Thu, 19 Oct 2023 15:23:52 +0200 Subject: [PATCH 3/3] Fix legends for matrices with no data --- core/templates/snippets/risk_matrix.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/core/templates/snippets/risk_matrix.html b/core/templates/snippets/risk_matrix.html index 1731ebc..48977a3 100644 --- a/core/templates/snippets/risk_matrix.html +++ b/core/templates/snippets/risk_matrix.html @@ -40,16 +40,16 @@
{% for row in matrix.render_grid_as_colors reversed %} {% with row_index=forloop.revcounter0 %} {% if enriched_data %} @@ -70,17 +70,17 @@ {% endfor %} - {% for probability in matrix.parse_json.probability %} + {% for impact in matrix.parse_json.impact %} {% endfor %}
- {% with impact=matrix.parse_json.impact|index:row_index %} - {{ impact.name }}: - {{ impact.description|linebreaksbr }} + {% with probability=matrix.parse_json.probability|index:row_index %} + {{ probability.name }}: + {{ probability.description|linebreaksbr }} {% endwith %}
- {{ probability.name }}: - {{ probability.description|linebreaksbr }} + {{ impact.name }}: + {{ impact.description|linebreaksbr }}
- {% trans "Probability" %} + {% trans "Impact" %}