Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add planned_remediation_version and effort_for_fixing fields #7850

Merged
merged 2 commits into from
May 26, 2023
Merged

Add planned_remediation_version and effort_for_fixing fields #7850

merged 2 commits into from
May 26, 2023

Conversation

ptrovatelli
Copy link
Collaborator

@ptrovatelli ptrovatelli commented Mar 20, 2023 •
edited

Description

Add 2 fields:

  • planned remediation version: in what version of the product we plan to remediate this finding
  • effort for fixing : is it easy, medium or hard to fix. Help prioritize fixes

Test results
tests.pdf

accesslint[bot]
accesslint bot reviewed Mar 20, 2023
View reviewed changes
Copy link

@accesslint accesslint bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are accessibility issues in these changes.

dojo/templates/dojo/findings_list_snippet.html Outdated Show resolved Hide resolved
accesslint[bot]
accesslint bot reviewed Mar 20, 2023
View reviewed changes
Copy link

@accesslint accesslint bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👏 You fixed the issue(s)! Great work.

@github-actions github-actions bot added the New Migration Adding a new migration file. Take care when merging. label Mar 20, 2023
@ptrovatelli ptrovatelli changed the title wip Add planned_remediation_version and effort_for_fixing fields Add planned_remediation_version and effort_for_fixing fields Mar 20, 2023
shipko
shipko reviewed Mar 21, 2023
View reviewed changes
dojo/filters.py Outdated
@@ -1221,6 +1221,7 @@ class FindingFilter(FindingFilterWithTags):
mitigated = DateRangeFilter(label="Mitigated Date")

planned_remediation_date = DateRangeOmniFilter()
planned_remediation_version = CharFilter(lookup_expr='icontains', label="Planned remediation version")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, add localization

dojo/forms.py Outdated
required=False,
choices=EFFORT_FOR_FIXING_CHOICES,
error_messages={
'invalid_choice': 'Select valid choice: Low,Medium,High'})
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, add localization

dojo/forms.py Outdated
required=False,
choices=EFFORT_FOR_FIXING_CHOICES,
error_messages={
'invalid_choice': 'Select valid choice: Low,Medium,High'})
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, add localization

dojo/forms.py Outdated
required=False,
choices=EFFORT_FOR_FIXING_CHOICES,
error_messages={
'invalid_choice': 'Select valid choice: Low,Medium,High'})
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, add localization

dojo/templates/dojo/findings_list_snippet.html Outdated
@@ -94,6 +94,10 @@ <h3 class="has-filters">
<input id="id_bulk_date" name="date" type="date" alt="Select the date the Findings were discovered"/><br/>
<label style="display: block" for="id_bulk_planned_remediation_date">Planned Remediation Date</label>
<input id="id_bulk_planned_remediation_date" name="planned_remediation_date" type="date" alt="Select the date the Finding will be remediated"/><br/>

<label style="display: block" for="id_bulk_planned_remediation_version">Planned remediation version</label>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, add localization

dojo/templates/dojo/view_finding.html Outdated
@@ -252,6 +252,9 @@ <h3 class="pull-left finding-title">
{% if finding.planned_remediation_date %}
<th>Planned Remediation</th>
{% endif%}
{% if finding.planned_remediation_version %}
<th>Planned Remediation version</th>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, add localization

dojo/templates/dojo/view_finding.html Outdated
@@ -526,6 +532,9 @@ <h3 class="pull-left finding-title">
{% if 'is_finding_groups_enabled'|system_setting_enabled and finding.finding_group %}
<th>Group</th>
{% endif %}
{% if finding.effort_for_fixing %}
<th>Effort for fixing</th>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, add localization

dojo/templates/dojo/view_test.html Outdated
@@ -553,6 +553,8 @@ <h4 class="has-filters"> Findings ({{findings.total_count}}) <small>{{ test.id|g
<label><b>Planned Remediation Date</b></label><br/>
<input id="id_bulk_planned_remediation_date" class="datepicker form-control hasDatepicker" name="planned_remediation_date" type="date"
alt="Select the date the Finding will be remediated"/><br/>
<label style="display: block">Planned remediation version</label>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, add localization

@ptrovatelli ptrovatelli force-pushed the add-planned_remediation_version-and-effort_for_fixing branch from e78d051 to d1be538 Compare March 30, 2023 09:59
@ptrovatelli
Copy link
Collaborator Author

@shipko tests finally went through after many reruns :) . All good to go? thanks

@shipko
Copy link
Contributor

shipko commented Apr 3, 2023 •
edited

@ptrovatelli Good job!

@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@Maffooch
Copy link
Contributor

@ptrovatelli I am a little nervous to attempt to fix these conflicts. They are pretty large chunks 😬

@ptrovatelli ptrovatelli force-pushed the add-planned_remediation_version-and-effort_for_fixing branch from b635417 to a2834b2 Compare May 26, 2023 07:00
@github-actions
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@ptrovatelli ptrovatelli force-pushed the add-planned_remediation_version-and-effort_for_fixing branch from a2834b2 to c6e9ed5 Compare May 26, 2023 08:51
@ptrovatelli
Copy link
Collaborator Author

@Maffooch all good now :)

mtesauro
mtesauro approved these changes May 26, 2023
View reviewed changes
Copy link
Contributor

@mtesauro mtesauro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved

@Maffooch Maffooch merged commit ce44e1e into DefectDojo:dev May 26, 2023
112 of 113 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shipko shipko shipko left review comments

@accesslint accesslint[bot] accesslint left review comments

@grendel513 grendel513 grendel513 approved these changes

@mtesauro mtesauro mtesauro approved these changes

@Maffooch Maffooch Maffooch approved these changes

@blakeaowens blakeaowens blakeaowens approved these changes

Assignees
No one assigned
Labels
enhancement localization New Migration Adding a new migration file. Take care when merging. parser ui
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@ptrovatelli @shipko @Maffooch @grendel513 @mtesauro @blakeaowens