Skip to content

Commit e7e12a4

Browse files
Merge branch 'dev' into reimport_fix_available
2 parents 328dd8a + e15bddd commit e7e12a4

4 files changed

Lines changed: 16 additions & 3 deletions

File tree

.github/workflows/gh-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Setup Node
2222
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
2323
with:
24-
node-version: '24.10.0' # TODO: Renovate helper might not be needed here - needs to be fully tested
24+
node-version: '24.11.0' # TODO: Renovate helper might not be needed here - needs to be fully tested
2525

2626
- name: Cache dependencies
2727
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0

.github/workflows/renovate.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
uses: suzuki-shunsuke/github-action-renovate-config-validator@c22827f47f4f4a5364bdba19e1fe36907ef1318e # v1.1.1
2222
with:
2323
strict: "true"
24-
validator_version: 41.163.6 # renovate: datasource=github-releases depName=renovatebot/renovate
24+
validator_version: 41.165.5 # renovate: datasource=github-releases depName=renovatebot/renovate

.github/workflows/validate_docs_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup Node
1919
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
2020
with:
21-
node-version: '24.10.0' # TODO: Renovate helper might not be needed here - needs to be fully tested
21+
node-version: '24.11.0' # TODO: Renovate helper might not be needed here - needs to be fully tested
2222

2323
- name: Cache dependencies
2424
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0

dojo/api_v2/serializers.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1692,6 +1692,9 @@ class FindingSerializer(serializers.ModelSerializer):
16921692
many=True, read_only=True, source="risk_acceptance_set",
16931693
)
16941694
push_to_jira = serializers.BooleanField(default=False)
1695+
found_by = serializers.PrimaryKeyRelatedField(
1696+
queryset=Test_Type.objects.all(), many=True,
1697+
)
16951698
age = serializers.IntegerField(read_only=True)
16961699
sla_days_remaining = serializers.IntegerField(read_only=True, allow_null=True)
16971700
finding_meta = FindingMetaSerializer(read_only=True, many=True)
@@ -1774,6 +1777,16 @@ def update(self, instance, validated_data):
17741777
if parsed_vulnerability_ids:
17751778
save_vulnerability_ids(instance, parsed_vulnerability_ids)
17761779

1780+
# Get found_by from validated_data
1781+
found_by = validated_data.pop("found_by", None)
1782+
# Handle updates to found_by data
1783+
if found_by:
1784+
instance.found_by.set(found_by)
1785+
# If there is no argument entered for found_by, the user would like to clear out the values on the Finding's found_by field
1786+
# Findings still maintain original found_by value associated with their test
1787+
# In the event the user does not supply the found_by field at all, we do not modify it
1788+
elif isinstance(found_by, list) and len(found_by) == 0:
1789+
instance.found_by.clear()
17771790
instance = super().update(
17781791
instance, validated_data,
17791792
)

0 commit comments

Comments
 (0)