Skip to content

fix(report) #3836: respect withSubProject for licenseInfo reports #3837

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

Open
YianZhao wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix(report) #3836: respect withSubProject for licenseInfo reports #3837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
003c355
fix(report): respect withSubProject for licenseInfo reports
YianZhao Mar 11, 2026
52f3b8d
Merge branch 'main' into bug-a-licenseinfo-withsubproject
YianZhao Mar 11, 2026
1356e32
fix(report): remove redundant hardcoded logic from SW360ReportController
YianZhao Mar 15, 2026
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
1 change: 0 additions & 1 deletion ...ver/src/main/java/org/eclipse/sw360/rest/resourceserver/report/SW360ReportController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,6 @@ private void getLicensesReports(
private void getLicensesInfoReports(
HttpServletResponse response, User sw360User, String module, String projectId, SW360ReportBean reportBean
) throws SW360Exception {
// TODO: use `withSubProject` while generating LicenseInfo report.
try {
downloadExcelReport(response, sw360User, module, projectId, defaultByteBufferVal, reportBean);
} catch (Exception e) {
Expand Down
3 changes: 2 additions & 1 deletion ...server/src/main/java/org/eclipse/sw360/rest/resourceserver/report/SW360ReportService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,8 @@ public ByteBuffer getLicenseInfoBuffer(User sw360User, String id, SW360ReportBea
: null;

List<ProjectLink> mappedProjectLinks = projectService.createLinkedProjects(sw360Project,
projectService.filterAndSortAttachments(SW360Constants.LICENSE_INFO_ATTACHMENT_TYPES), true, true, sw360User);
projectService.filterAndSortAttachments(SW360Constants.LICENSE_INFO_ATTACHMENT_TYPES), true,
reportBean.isWithSubProject(), sw360User);

List<AttachmentUsage> attchmntUsg = attachmentService.getAttachemntUsages(id);

Expand Down
Loading