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

Fix: Made Verinice reports include attached reports. #2360

Merged
merged 4 commits into from
Feb 4, 2025
Merged

Fix: Made Verinice reports include attached reports. #2360

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b8b5c9
Fix: Made Verinice reports include attached reports.
jhelmold Jan 29, 2025
f264f5d
Switched the prioritization for loading the attached report formats.
jhelmold Jan 30, 2025
8af6feb
Merge branch 'main' into GEA-840_Verinice_ISM_report_does_not_include…
jhelmold Jan 30, 2025
b871cba
Merge branch 'main' into GEA-840_Verinice_ISM_report_does_not_include…
jhelmold Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions src/manage_sql_report_formats.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3997,11 +3997,18 @@ apply_report_format (gchar *report_format_id,

rf_dependencies_string
Copy link
Contributor

Choose a reason for hiding this comment

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

A bit late but this could have an if (report_config) around it, because the report_config is optional. It would save the SQL query when the report_config is 0 (and maybe prevent some weird situations if someone somehow has a report_config with id 0).

= sql_string ("SELECT value"
" FROM report_format_params"
" WHERE report_format = %llu"
" AND type = %i",
report_format,
REPORT_FORMAT_PARAM_TYPE_REPORT_FORMAT_LIST);
" FROM report_config_params"
" WHERE report_config = %llu AND name = 'Attached report formats'",
report_config);

if (!rf_dependencies_string || !strcmp (rf_dependencies_string, ""))
rf_dependencies_string
= sql_string ("SELECT value"
" FROM report_format_params"
" WHERE report_format = %llu"
" AND type = %i",
report_format,
REPORT_FORMAT_PARAM_TYPE_REPORT_FORMAT_LIST);

if (rf_dependencies_string)
{
Expand Down
Loading