cleanup

Author: labkey-martyp

ehr/resources/web/ehr/DataEntryUtils.js

@@ -501,7 +501,6 @@ EHR.DataEntryUtils = new function(){
             }
 
             meta.showTooltip = EHR.DataEntryUtils.shouldShowTooltips();
-
             col.renderer = LABKEY.ext4.Util.getDefaultRenderer(col, meta, grid);
 
             //HTML-encode the column header

ehr/resources/web/ehr/plugin/CellEditing.js

@@ -4,7 +4,9 @@ Ext4.define('EHR.grid.plugin.CellEditing', {
     alias: 'plugin.ehr-cellediting',
 
     ensureLookups: function(record, column, editor) {
-        if (record.data[column.dataIndex] && editor?.field?.store) {
+        if( (editor?.field?.xtype === 'labkey-combo' || editor?.field?.xtype === 'ehr-simplecombo')
+                && record.data[column.dataIndex] && editor?.field?.store) {
+
             const valid = editor.field.store.findExact("value", record.data[column.dataIndex]) !== -1
 
             if (!valid) {
@@ -22,11 +24,7 @@ Ext4.define('EHR.grid.plugin.CellEditing', {
 
     getEditor: function(record, column) {
         const editor = this.callParent(arguments);
-
-        if( editor?.field?.xtype === 'labkey-combo' || editor?.field?.xtype === 'ehr-simplecombo') {
-            this.ensureLookups(record, column, editor);
-        }
-
+        this.ensureLookups(record, column, editor);
         return editor;
     }
 });

ehr/resources/web/ehr/plugin/ClinicalObservationsCellEditing.js

@@ -71,9 +71,7 @@ Ext4.define('EHR.grid.plugin.ClinicalObservationsCellEditing', {
         // Keep upward pointer correct for each use - editors are shared between locking sides
         editor.editingPlugin = me;
 
-        if( editor?.field?.xtype === 'labkey-combo' || editor?.field?.xtype === 'ehr-simplecombo') {
-            this.ensureLookups(record, column, editor);
-        }
+        this.ensureLookups(record, column, editor);
 
         return editor;
     }