From d5d96ef3c23ff2908ae9fe6630c8999bfff075d5 Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Sat, 18 Jan 2025 04:01:26 -0800 Subject: [PATCH 1/2] Don't try to edit query datasets. Don't allow delete/populate all on lookups on production. --- ehr/src/org/labkey/ehr/EHRController.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ehr/src/org/labkey/ehr/EHRController.java b/ehr/src/org/labkey/ehr/EHRController.java index 6ea62c1f4..c7805f3d2 100644 --- a/ehr/src/org/labkey/ehr/EHRController.java +++ b/ehr/src/org/labkey/ehr/EHRController.java @@ -383,7 +383,7 @@ public ModelAndView getView(EHRQueryForm form, BindException errors) ActionURL url = getViewContext().getActionURL().clone(); - if (keyField != null) + if (keyField != null && ti.getUpdateService() != null) { String detailsStr; String importStr; @@ -1427,7 +1427,14 @@ public Object execute(PopulateLookupsForm form, BindException errors) throws Exc return null; List lookups = new ArrayList<>(); - lookups.add("All"); + + // This is too dangerous to leave in production so only include it if a manifest is provided as a URL parameter + // such as in automated testing + if (form.getManifest() != null) + { + lookups.add("All"); + } + lookups.add("lookup_sets"); BufferedReader reader = Readers.getReader(_lookupsManifest.getInputStream()); From ed936355edb44f76c54f329ac33e0bbde082d4cb Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Sat, 18 Jan 2025 04:01:38 -0800 Subject: [PATCH 2/2] Cleanup --- .../api/ehr/demographics/HousingDemographicsProvider.java | 2 -- ehr/src/org/labkey/ehr/table/DefaultEHRCustomizer.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ehr/api-src/org/labkey/api/ehr/demographics/HousingDemographicsProvider.java b/ehr/api-src/org/labkey/api/ehr/demographics/HousingDemographicsProvider.java index aa51a0be5..a9649c35e 100644 --- a/ehr/api-src/org/labkey/api/ehr/demographics/HousingDemographicsProvider.java +++ b/ehr/api-src/org/labkey/api/ehr/demographics/HousingDemographicsProvider.java @@ -47,8 +47,6 @@ protected Collection getFieldKeys() keys.add(FieldKey.fromString("date")); keys.add(FieldKey.fromString("cond")); keys.add(FieldKey.fromString("reason")); - - //cnprc keys.add(FieldKey.fromString("location")); return keys; diff --git a/ehr/src/org/labkey/ehr/table/DefaultEHRCustomizer.java b/ehr/src/org/labkey/ehr/table/DefaultEHRCustomizer.java index b15e8d90b..a61293b5b 100644 --- a/ehr/src/org/labkey/ehr/table/DefaultEHRCustomizer.java +++ b/ehr/src/org/labkey/ehr/table/DefaultEHRCustomizer.java @@ -1216,7 +1216,7 @@ private void customizeAnimalTable(AbstractTableInfo ds) ds.addColumn(col20); var col8 = getWrappedIdCol(us, ds, "CageClass", "demographicsCageClass"); - col8.setLabel("Required Case Size"); + col8.setLabel("Required Cage Size"); col8.setDescription("Calculates the cage size necessary for this animal, based on weight using The Guide requirements"); ds.addColumn(col8);