Skip to content

EHR Action Updates #887

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-martyp merged 2 commits into from
Mar 6, 2025
Merged

EHR Action Updates #887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5d96ef
Don't try to edit query datasets. Don't allow delete/populate all on …
labkey-martyp Jan 18, 2025
ed93635
Cleanup
labkey-martyp Jan 18, 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
2 changes: 0 additions & 2 deletions ehr/api-src/org/labkey/api/ehr/demographics/HousingDemographicsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ protected Collection<FieldKey> getFieldKeys()
keys.add(FieldKey.fromString("date"));
keys.add(FieldKey.fromString("cond"));
keys.add(FieldKey.fromString("reason"));

//cnprc
keys.add(FieldKey.fromString("location"));

return keys;
Expand Down
11 changes: 9 additions & 2 deletions ehr/src/org/labkey/ehr/EHRController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -1427,7 +1427,14 @@ public Object execute(PopulateLookupsForm form, BindException errors) throws Exc
return null;

List<String> 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());
Expand Down
2 changes: 1 addition & 1 deletion ehr/src/org/labkey/ehr/table/DefaultEHRCustomizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
Loading