From 2832566dbd35fd004978c44e60f9e40c967d49a0 Mon Sep 17 00:00:00 2001 From: Tim Chamberlain Date: Fri, 28 Apr 2023 13:59:08 -0500 Subject: [PATCH] CTLE-421: fixes for failing tests, removed no longer necessary loop --- .../core/actions/tables/GetAction.java | 26 +------------------ 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/GetAction.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/GetAction.java index cb9b20db..0f8f99a3 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/GetAction.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/GetAction.java @@ -377,7 +377,7 @@ public class GetAction if(getInput.getShouldOmitHiddenFields() || getInput.getShouldMaskPasswords()) { - Map fields = QContext.getQInstance().getTable(record.getTableName()).getFields(); + Map fields = QContext.getQInstance().getTable(getInput.getTableName()).getFields(); for(String fieldName : fields.keySet()) { QFieldType fieldType = fields.get(fieldName).getType(); @@ -398,30 +398,6 @@ public class GetAction QValueFormatter.setDisplayValuesInRecords(getInput.getTable(), List.of(returnRecord)); } - ////////////////////////////// - // mask any password fields // - ////////////////////////////// - Map fields = QContext.getQInstance().getTable(record.getTableName()).getFields(); - for(String fieldName : fields.keySet()) - { - QFieldMetaData field = fields.get(fieldName); - if(getInput.getShouldOmitHiddenFields()) - { - if(field.getIsHidden()) - { - returnRecord.removeValue(fieldName); - } - } - else if(getInput.getShouldMaskPasswords()) - { - if(field.getType() != null && field.getType().needsMasked()) - { - returnRecord.setValue(fieldName, "************"); - returnRecord.setDisplayValue(fieldName, "************"); - } - } - } - ////////////////////////////////////////////////////////////////////////////// // note - shouldFetchHeavyFields should be handled by the underlying action // //////////////////////////////////////////////////////////////////////////////