Skip to content

Commit 86df461

Browse files
DatabaseIdentifier (#794)
* TableInfo.getMetaDataName() * import * replace .get(column.getAlias()) * Remove unnecessary HttpView.currentView() casts in JSPs (#791) * rename get*Name() -> get*Identifier() --------- Co-authored-by: Adam Rauch <adam@labkey.com>
1 parent a89f8b8 commit 86df461

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

DBUtils/api-src/org/labkey/dbutils/api/schema/DecoratedTableInfo.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.labkey.api.data.ColumnInfo;
88
import org.labkey.api.data.Container;
99
import org.labkey.api.data.ContainerFilter;
10+
import org.labkey.api.data.DatabaseIdentifier;
1011
import org.labkey.api.data.DatabaseTableType;
1112
import org.labkey.api.data.DbSchema;
1213
import org.labkey.api.data.MethodInfo;
@@ -90,8 +91,8 @@ public SQLFragment getSQLName()
9091

9192
@Nullable
9293
@Override
93-
public String getMetaDataName() {
94-
return _tableInfo.getMetaDataName();
94+
public DatabaseIdentifier getMetaDataIdentifier() {
95+
return _tableInfo.getMetaDataIdentifier();
9596
}
9697

9798
@NotNull

WNPRC_Purchasing/src/org/labkey/wnprc_purchasing/WNPRC_PurchasingController.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,9 @@ public Object execute(RequestForm requestForm, BindException errors) throws Exce
242242
columns.add(FieldKey.fromString("qcState/Label"));
243243
final Map<FieldKey, ColumnInfo> colMap = QueryService.get().getColumns(tableInfo, columns);
244244
TableSelector tableSelector = new TableSelector(tableInfo, colMap.values(), filter, null);
245-
oldStatusVal = String.valueOf(tableSelector.getMap().get(colMap.get(FieldKey.fromString("qcState/Label")).getAlias()));
245+
var m = tableSelector.getMap();
246+
var label = colMap.get(FieldKey.fromString("qcState/Label"));
247+
oldStatusVal = String.valueOf(label.getValue(m));
246248
}
247249

248250
List<ValidationException> validationExceptions = WNPRC_PurchasingManager.get().submitRequestForm(getUser(), getContainer(), requestForm);

0 commit comments

Comments
 (0)