Skip to content

Commit 373a1ab

Browse files
committed
display analysis_preset in modal
Signed-off-by: tdruez <tdruez@aboutcode.org>
1 parent a9d0bb7 commit 373a1ab

3 files changed

Lines changed: 22 additions & 3 deletions

File tree

product_portfolio/templates/product_portfolio/modals/manage_triage_rulesets_form.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,14 @@
4141
</span>
4242
</span>
4343
{% endif %}
44+
{% if ruleset.analysis_preset %}
45+
<span class="d-flex align-items-center gap-2 mt-1">
46+
<span class="small text-body-secondary">{% trans "Auto-applies preset:" %}</span>
47+
<span class="badge bg-secondary-subtle text-secondary-emphasis fw-normal">
48+
{{ ruleset.analysis_preset.name }}
49+
</span>
50+
</span>
51+
{% endif %}
4452
</span>
4553
</label>
4654
{% endfor %}

product_portfolio/tests/test_views.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4385,6 +4385,17 @@ def test_get_with_change_perm_renders_available_rulesets(self):
43854385
self.assertContains(response, self.ruleset.name)
43864386
self.assertNotContains(response, "checked")
43874387

4388+
def test_get_displays_the_ruleset_analysis_preset(self):
4389+
preset = AnalysisPreset.objects.create(
4390+
name="Auto-Close Preset", state="not_affected", dataspace=self.dataspace
4391+
)
4392+
self.ruleset.analysis_preset = preset
4393+
self.ruleset.save()
4394+
self.client.login(username="nexb_user", password="secret")
4395+
url = self.product1.get_manage_triage_rulesets_url()
4396+
response = self.client.get(url)
4397+
self.assertContains(response, preset.name)
4398+
43884399
def test_get_marks_the_assigned_rulesets_as_checked(self):
43894400
ProductTriageRuleset.objects.create(
43904401
product=self.product1, ruleset=self.ruleset, dataspace=self.dataspace

product_portfolio/views.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2223,9 +2223,9 @@ def manage_triage_rulesets_view(request, dataspace, name, version=""):
22232223
dataspace__name=dataspace,
22242224
)
22252225
available_rulesets = list(
2226-
TriageRuleset.objects.filter(dataspace=product.dataspace, enabled=True).order_by(
2227-
"-precedence", "name"
2228-
)
2226+
TriageRuleset.objects.filter(dataspace=product.dataspace, enabled=True)
2227+
.select_related("analysis_preset")
2228+
.order_by("-precedence", "name")
22292229
)
22302230

22312231
if request.method == "POST":

0 commit comments

Comments
 (0)