Skip to content

Migrate away from deprecated SampleTypeService method #1079

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

Merged
labkey-adam merged 1 commit into from
Dec 18, 2025
Merged

Migrate away from deprecated SampleTypeService method #1079

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions EHR_SM/src/org/labkey/ehr_sm/EHR_SMController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public ModelAndView getView(AdminForm adminForm, boolean reshow, BindException e
{
PropertyManager.PropertyMap props = PropertyManager.getProperties(getContainer(), EHR_SMManager.ANIMAL_SAMPLE_PROP_SET_NAME);
adminForm.setSelectedAnimalSampleTypes(props.keySet().toArray(new String[0]));
adminForm.setAnimalSampleTypes(SampleTypeService.get().getSampleTypes(getContainer(), getUser(), true));
adminForm.setAnimalSampleTypes(SampleTypeService.get().getSampleTypes(getContainer(), true));
adminForm.setSampleReceivedCol(props.get(EHR_SMManager.ANIMAL_SAMPLE_RECEIVED_PROP));

JspView<AdminForm> view = new JspView<>("/org/labkey/ehr_sm/view/admin.jsp", adminForm, errors);
Expand All @@ -129,7 +129,7 @@ public ModelAndView getView(AdminForm adminForm, boolean reshow, BindException e
public boolean handlePost(AdminForm adminForm, BindException errors)
{
WritablePropertyMap props = PropertyManager.getWritableProperties(getContainer(), EHR_SMManager.ANIMAL_SAMPLE_PROP_SET_NAME, true);
for (ExpSampleType animalSampleType : SampleTypeService.get().getSampleTypes(getContainer(), getUser(), true))
for (ExpSampleType animalSampleType : SampleTypeService.get().getSampleTypes(getContainer(), true))
{
if (Arrays.stream(adminForm.getSelectedAnimalSampleTypes()).anyMatch(s -> s.equals(animalSampleType.getName())))
{
Expand Down