diff --git a/modules/CmpdRegBulkLoader/src/client/CmpdRegBulkLoader.coffee b/modules/CmpdRegBulkLoader/src/client/CmpdRegBulkLoader.coffee index d2b7d42f5..ff2de5973 100644 --- a/modules/CmpdRegBulkLoader/src/client/CmpdRegBulkLoader.coffee +++ b/modules/CmpdRegBulkLoader/src/client/CmpdRegBulkLoader.coffee @@ -337,12 +337,13 @@ class AssignedPropertyController extends AbstractFormController code: "" name: "Select" selectedCode: "" + backendSearch: false setupInput: => # Alter input depending on dbProperty dbProp = @model.get('dbProperty') if @dbPropertyUrls[dbProp]? || dbProp.includes("Units") - @dbPropertyUrl = @dbPropertyUrls[@model.get('dbProperty')] + @dbPropertyUrl = @dbPropertyUrls[dbProp] if !@dbPropertyUrl? @dbPropertyUrl = @dbPropertyUrls["Units"] @setupSelect() @@ -358,7 +359,7 @@ class AssignedPropertyController extends AbstractFormController @selectListController = null @$('.bv_defaultVal').show() # Show date picker if dbProperty is a date - if @model.get('dbProperty').includes("Lot Synthesis Date") + if dbProp.includes("Lot Synthesis Date") @$('.bv_defaultVal').datepicker(); @$('.bv_defaultVal').datepicker( "option", "dateFormat", "yy-mm-dd" ); @$('.bv_defaultVal').attr('placeholder', 'YYYY-MM-DD') diff --git a/modules/Components/src/client/PickList.coffee b/modules/Components/src/client/PickList.coffee index d3e27f36e..b29a76673 100644 --- a/modules/Components/src/client/PickList.coffee +++ b/modules/Components/src/client/PickList.coffee @@ -366,8 +366,10 @@ class PickListSelect2Controller extends PickListSelectController allowClear: true width: @width - # Conditionally add the ajax property - if @collection.url? + # Conditionally add the ajax property to enable backend searching + # If a url is provided, backend search is enabled by default but + # can be toggled off by setting the 'backendSearch' option to false + if @collection.url? && (!@options.backendSearch? || @options.backendSearch is true) select2Options.ajax = url: (params) => if !params.term?