Skip to content
Merged
Changes from all commits
Commits
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
14 changes: 9 additions & 5 deletions ehr/resources/web/ehr/window/SaveTemplateWindow.js
Original file line number Diff line number Diff line change
Expand Up @@ -202,21 +202,25 @@ Ext4.define('EHR.window.SaveTemplateWindow', {

var tn = this.down('#templateName').getValue();
var rows = [];
var noFieldsSelected = false;

this.down('#theForm').items.each(function(tab){
var radioGroup = tab.down('#recordSelector');
var selections = radioGroup.getValue()[radioGroup.down('[name]').name];

if (selections == 'none')
return;

var fields = tab.down('#fieldSelector').getValue().fields;

if (!fields.length)
if (!fields || !fields.length){
noFieldsSelected = true;
return;
}

if (!(fields instanceof Array)) // single elements aren't wrapped in an array
fields = [fields];

if (selections == 'none')
return;

var store = Ext4.StoreMgr.get(tab.storeId);

var records = [];
Expand Down Expand Up @@ -249,7 +253,7 @@ Ext4.define('EHR.window.SaveTemplateWindow', {

if (!rows.length){
Ext4.Msg.hide();
Ext4.Msg.alert('Error', "No records selected");
Ext4.Msg.alert('Error', noFieldsSelected ? "At least one field is required and none are selected. Note: The field can be blank." : "No records selected");
return;
}

Expand Down