Skip to content

Merge discvr-24.11 to discvr-25.3 #43

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

Merge discvr-24.11 to discvr-25.3 #43

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
865087f
Bugfix to DemographicsSources
bbimber Mar 16, 2025
f26c5d3
Merge discvr-24.11 to discvr-25.3
bbimber Mar 16, 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
9 changes: 4 additions & 5 deletions laboratory/src/org/labkey/laboratory/query/LaboratoryTableCustomizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,8 @@ private void appendDemographicsCols(final UserSchema us, AbstractTableInfo ti, C
{
for (final DemographicsSource qd : qds)
{
Container targetContainer = us.getContainer().isWorkbookOrTab() ? us.getContainer().getParent() : us.getContainer();
TableInfo target = qd.getTableInfo(targetContainer, us.getUser());
Container parentContainer = us.getContainer().isWorkbookOrTab() ? us.getContainer().getParent() : us.getContainer();
TableInfo target = qd.getTableInfo(parentContainer, us.getUser());

//TODO: push this into LaboratoryService and also cache them?
if (target != null)
Expand All @@ -290,11 +290,10 @@ private void appendDemographicsCols(final UserSchema us, AbstractTableInfo ti, C
}

String name = ColumnInfo.legalNameFromName(qd.getLabel());

if (ti.getColumn(name) != null)
continue;

BaseColumnInfo col = WrappedColumnInfo.wrapAsCopy(ti, FieldKey.fromString(name), subjectCol, qd.getLabel(), null);
ExprColumn col = new ExprColumn(ti, FieldKey.fromString(name), subjectCol.getValueSql(ExprColumn.STR_TABLE_ALIAS), JdbcType.INTEGER, subjectCol);
col.setName(name);
col.setCalculated(true);
col.setShownInInsertView(false);
Expand All @@ -304,7 +303,7 @@ private void appendDemographicsCols(final UserSchema us, AbstractTableInfo ti, C
col.setUserEditable(false);
col.setKeyField(false);

UserSchema targetSchema = qd.getTableInfo(targetContainer, us.getUser()).getUserSchema();
final UserSchema targetSchema = target.getUserSchema();
col.setFk(new QueryForeignKey(us, ti.getContainerFilter(), targetSchema, null, qd.getQueryName(), qd.getTargetColumn(), qd.getTargetColumn())
{
@Override
Expand Down