Commit 2e4f197b authored by Martin Lowe's avatar Martin Lowe 🇨🇦
Browse files

Merge branch 'malowe/dev/v1.4.2' into 'master'

v1.4.2 release candidate

See merge request !554
parents bcfcbb3c e8cb439d
Pipeline #2886 passed with stage
in 0 seconds
......@@ -116,6 +116,9 @@ public class OrganizationResource extends AbstractRESTResource {
docids.add(wg.getResources().getParticipationAgreements().getOrganization().getDocumentId());
}
wrap.setParam(FoundationDBParameterNames.DOCUMENT_IDS.getName(), docids);
} else if(wg == null && StringUtils.isNotBlank(workingGroup)) {
// return empty response if wg was set but no results
return Response.ok(Collections.emptyList()).build();
}
List<MemberOrganization> orgs = orgService.get(wrap);
if (orgs.isEmpty()) {
......
......@@ -13,7 +13,7 @@
"individual": null,
"organization": {
"document_id": "32c5a745df264aa2a809",
"pdf": "https://www.eclipse.org/org/workinggroups/wpga/eclipse-cloud-development-tools-participation-agreement.pdf"
"pdf": "https://www.eclipse.org/org/workinggroups/wgpa/adoptium-working-group-participation-agreement.pdf"
}
},
"website": "https://adoptium.net",
......@@ -530,7 +530,7 @@
}
},
"website": "https://www.osgi.org/",
"members": "https://www.eclipse.org/org/workinggroups/members.php?wg=osgi",
"members": "https://www.osgi.org/membership/members/",
"sponsorship": "",
"contact_form": "https://accounts.eclipse.org/contact/membership"
},
......@@ -676,7 +676,7 @@
}
},
"website": "https://oniroproject.org/",
"members": "",
"members": "https://oniroproject.org/#initiating-members",
"sponsorship": "",
"contact_form": "https://accounts.eclipse.org/contact/membership"
},
......@@ -740,7 +740,7 @@
"title": "OpenHW Europe Working Group",
"status": "active",
"parent_organization": "ohwg",
"logo": "",
"logo": "https://www.eclipse.org/org/workinggroups/assets/images/wg-openhw-europe.svg",
"description": "This working group is a joint initiative of the Eclipse Foundation AISBL and its partner the OpenHW Group. The overarching goal of this working group is to engage in initiatives complementing the general work program of the OpenHW Group that are of strategic interest to the joint members of Eclipse Foundation and OpenHW Group that relate to the European marketplace, including strategic market analysis, development of technical requirements, and digital sovereignty.",
"resources": {
"charter": "https://www.eclipse.org/org/workinggroups/openhw-europe-charter.php",
......@@ -751,7 +751,7 @@
"pdf": "https://www.eclipse.org/org/workinggroups/wgpa/openhw-europe-working-group-participation-agreement.pdf"
}
},
"website": "https://www.openhwgroup.org/europe",
"website": "",
"members": "",
"sponsorship": "",
"contact_form": "https://accounts.eclipse.org/contact/membership",
......@@ -821,7 +821,7 @@
}
},
"website": "https://sdv.eclipse.org/",
"members": "",
"members": "https://sdv.eclipse.org/index.html#members",
"sponsorship": "https://www.eclipse.org/org/workinggroups/sponsorship/working-group-sponsorship-agreement.pdf",
"contact_form": "https://accounts.eclipse.org/contact/membership"
},
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment