From 90df9bb693a622eb04f62e63d467a03662068c87 Mon Sep 17 00:00:00 2001 From: Chad Sebranek Date: Thu, 10 Apr 2025 15:31:23 -0500 Subject: [PATCH 1/2] fix for selecting records for a template --- ehr/resources/scripts/ehr/triggers.js | 3 ++- ehr/resources/web/ehr/window/SaveTemplateWindow.js | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ehr/resources/scripts/ehr/triggers.js b/ehr/resources/scripts/ehr/triggers.js index a470e1933..abf987be4 100644 --- a/ehr/resources/scripts/ehr/triggers.js +++ b/ehr/resources/scripts/ehr/triggers.js @@ -252,7 +252,8 @@ EHR.Server.Triggers.beforeUpdate = function(row, oldRow, errors){ helper.logDebugMsg(row); if (EHR.Server.Security.verifyPermissions('update', row, oldRow) === false){ - errors._form = 'Insufficient permissions to update: ' + helper.getQueryName() + ' to status: ' + row.QCStateLabel + ', from: ' + (oldRow ? oldRow.QCStateLabel : ''); + console.log((EHR.Server.Security.verifyPermissions('update', row, oldRow))); + errors._form = 'Insufficient permissions to updateee: ' + helper.getQueryName() + ' to status: ' + row.QCStateLabel + ', from: ' + (oldRow ? oldRow.QCStateLabel : ''); return; } diff --git a/ehr/resources/web/ehr/window/SaveTemplateWindow.js b/ehr/resources/web/ehr/window/SaveTemplateWindow.js index 6a727c2ac..63d222e80 100644 --- a/ehr/resources/web/ehr/window/SaveTemplateWindow.js +++ b/ehr/resources/web/ehr/window/SaveTemplateWindow.js @@ -204,7 +204,8 @@ Ext4.define('EHR.window.SaveTemplateWindow', { var rows = []; this.down('#theForm').items.each(function(tab){ - var selections = tab.down('#recordSelector').getValue().inputValue; + var radioGroup = tab.down('#recordSelector'); + var selections = radioGroup.getValue()[radioGroup.down('[name]').name]; var fields = tab.down('#fieldSelector').getValue().fields; if (!fields.length) @@ -220,7 +221,7 @@ Ext4.define('EHR.window.SaveTemplateWindow', { var records = []; if (selections == 'selected'){ - records = this.grid.getSelectionModel().getSelections(); + records = this.targetGrid.getSelectionModel().getSelection(); if (!records.length){ Ext4.Msg.hide(); From d52c748599299c833c3cf90c737442f78a86b5ec Mon Sep 17 00:00:00 2001 From: Chad Sebranek Date: Thu, 10 Apr 2025 15:35:10 -0500 Subject: [PATCH 2/2] undo console log --- ehr/resources/scripts/ehr/triggers.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ehr/resources/scripts/ehr/triggers.js b/ehr/resources/scripts/ehr/triggers.js index abf987be4..a470e1933 100644 --- a/ehr/resources/scripts/ehr/triggers.js +++ b/ehr/resources/scripts/ehr/triggers.js @@ -252,8 +252,7 @@ EHR.Server.Triggers.beforeUpdate = function(row, oldRow, errors){ helper.logDebugMsg(row); if (EHR.Server.Security.verifyPermissions('update', row, oldRow) === false){ - console.log((EHR.Server.Security.verifyPermissions('update', row, oldRow))); - errors._form = 'Insufficient permissions to updateee: ' + helper.getQueryName() + ' to status: ' + row.QCStateLabel + ', from: ' + (oldRow ? oldRow.QCStateLabel : ''); + errors._form = 'Insufficient permissions to update: ' + helper.getQueryName() + ' to status: ' + row.QCStateLabel + ', from: ' + (oldRow ? oldRow.QCStateLabel : ''); return; }