Skip to content

Fix planned remediation version appearing under Reviewers in findings list#14773

Merged
mtesauro merged 1 commit intoDefectDojo:devfrom
valentijnscholten:fix/findings-list-planned-remediation-header
Apr 30, 2026
Merged

Fix planned remediation version appearing under Reviewers in findings list#14773
mtesauro merged 1 commit intoDefectDojo:devfrom
valentijnscholten:fix/findings-list-planned-remediation-header

Conversation

@valentijnscholten
Copy link
Copy Markdown
Member

Summary

The open findings table rendered a planned_remediation_version cell without a matching header column, so the version value aligned under the Reviewers header and shifted the rest of the row.

This adds the missing header (with sort link) and registers planned_remediation_version on FindingFilterHelper ordering so server-side sort matches the UI.

Fixes #14757.

The table body had a cell for planned_remediation_version without a matching
header, so values appeared under the Reviewers column. Add the missing th and
register planned_remediation_version on FindingFilterHelper ordering.

Fixes DefectDojo#14757
@github-actions github-actions Bot added the ui label Apr 28, 2026
@valentijnscholten valentijnscholten added this to the 2.58.0 milestone Apr 28, 2026
@Maffooch Maffooch requested review from Jino-T and blakeaowens April 29, 2026 15:43
Copy link
Copy Markdown
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

@mtesauro mtesauro merged commit 40e33d4 into DefectDojo:dev Apr 30, 2026
156 checks passed
Maffooch pushed a commit to devGregA/django-DefectDojo that referenced this pull request Apr 30, 2026
Pulls in 15 upstream commits including:

* dojo/sso/ consolidation (DefectDojo#14765) — SSO settings/urls/views/templates/
  remote-user moved into a self-contained package.
* dojo/notifications/ consolidation (DefectDojo#14767) — notification helper +
  templates moved into the package, with a new context_processors split.
* dojo/github/ consolidation (DefectDojo#14766) — github_issue_link package
  renamed and reshaped under dojo/github/{models,services,ui,...}.
* test_tag_inheritance.py extension (DefectDojo#14771).
* Bulk-delete findings extension hook (DefectDojo#14740).
* Planned-remediation-version column alignment fix (DefectDojo#14773).
* Dependency bumps (datatables.net, gitpython, python-gitlab, pyopenssl,
  vulners, ruff, postcss).

Conflict resolutions worth flagging:

* dojo/forms.py — kept dev's reshuffled imports (GITHUB_* models now
  re-exported via dojo.github.ui.forms; Global_Role moved to
  dojo.models). Dropped the duplicate Global_Role import; the legacy
  authorization rewrite still imports from
  dojo.authorization.models for the rest.
* dojo/settings/settings.dist.py — kept tailwind's UIPreferenceLoader
  chain and APP_DIRS=False, but added a shared
  _DOJO_EXTRA_TEMPLATE_DIRS list referenced by both TEMPLATES[0]["DIRS"]
  and the FilesystemLoader so that dojo/sso/settings.py:apply_sso_settings
  can append the SSO template dir at startup and have it resolved at
  render time.
* dojo/templates/dojo/login.html — Tailwind tree, kept the inline
  Tailwind-styled SSO buttons rather than dev's
  {% include "dojo/sso_login_buttons.html" %} (which is Bootstrap-classic
  flavored and mounted by the SSO consolidation against the classic tree
  only).
* unittests/test_remote_user.py — adopted dev's import path
  (dojo.sso.remote_user, dojo.models.Dojo_Group_Member).
* dojo/api_v2/permissions.py — added a backward-compat shim
  re-exporting from dojo.authorization.api_permissions because the
  legacy authorization consolidation deleted the old module but
  dojo/notifications/api/views.py (new from dev) still imports from the
  old path.

Verified: ruff clean on touched files; manage.py check passes;
unittests.test_authorized_users_ui + unittests.authorization +
unittests.test_user_ui_timestamps + unittests.test_rest_framework +
unittests.test_remote_user all green (1144 tests, 542 skipped).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants