Skip to content

Include trigger name in verifyNotUsed() signature update #1432

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-bpatel merged 1 commit into from
Sep 2, 2025
Merged

Include trigger name in verifyNotUsed() signature update #1432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion ONPRC_EHR_ComplianceDB/resources/queries/EHR_ComplianceDB/requirements.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ function beforeDelete(row, errors){
query = queries[j];
for (var i=0;i<fields.length;i++){
fieldName = fields[i];
if (helper.verifyNotUsed('ehr_compliancedb', query, 'requirementname', row[fieldName])){
if (helper.verifyNotUsed('ehr_compliancedb', query, 'requirementname', row[fieldName], 'requirements')){
addError(errors, fieldName, 'Cannot delete row with value: ' + row[fieldName] + ' because it is referenced by the table ' + query);
}
}
Expand Down
4 changes: 2 additions & 2 deletions onprc_billing/resources/queries/onprc_billing/chargeableItems.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ var helper = org.labkey.ldk.query.LookupValidationHelper.create(LABKEY.Security.
var ehrHelper = org.labkey.ehr.utils.TriggerScriptHelper.create(LABKEY.Security.currentUser.id, LABKEY.Security.currentContainer.id);

function beforeDelete(row, errors){
if (helper.verifyNotUsed('onprc_billing', 'invoicedItems', 'chargeid', row['rowid'])){
if (helper.verifyNotUsed('onprc_billing', 'invoicedItems', 'chargeid', row['rowid'], 'chargeableItems')){
addError(errors, 'name', 'Cannot delete row with ID: ' + row['rowid'] + ' because it is referenced by the table invoicedItems. You should inactivate this item instead.');
}

if (helper.verifyNotUsed('onprc_billing', 'miscCharges', 'chargeid', row['rowid'], ehrHelper.getEHRStudyContainerPath())){
if (helper.verifyNotUsed('onprc_billing', 'miscCharges', 'chargeid', row['rowid'], ehrHelper.getEHRStudyContainerPath(), 'chargeableItems')){
addError(errors, 'name', 'Cannot delete row with ID: ' + row['rowid'] + ' because it is referenced by the table miscCharges. You should inactivate this item instead.');
}
}
Expand Down