Merge pull request #5517 from ehuelsmann/followup-filteringselect

Set our default values for FilteringSelect
ledgersmb · Jun 5, 2021 · 0dbb982 · 0dbb982
2 parents d127dec + 00278cd
commit 0dbb982
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/UI/js-src/lsmb/FilteringSelect.js b/UI/js-src/lsmb/FilteringSelect.js
@@ -1,11 +1,15 @@
 /** @format */
 
+/* eslint no-template-curly-in-string: 0 */
+
 define([
     "dijit/form/FilteringSelect",
     "dojo/_base/declare",
     "dojo/keys"
 ], function (FilteringSelect, declare, keys) {
     return declare("lsmb/FilteringSelect", [FilteringSelect], {
+        autoComplete: false,
+        queryExpr: "*${0}*",
         onKey: function (e) {
             var d = this.dropDown;
             if (d && e.keyCode === keys.TAB) {

diff --git a/UI/js-src/lsmb/accounts/AccountSelector.js b/UI/js-src/lsmb/accounts/AccountSelector.js
@@ -1,7 +1,5 @@
 /** @format */
 
-/* eslint no-template-curly-in-string: 0 */
-
 define([
     "lsmb/FilteringSelect",
     "dojo/_base/declare",
@@ -12,13 +10,11 @@ define([
         [filteringSelect],
         {
             store: accountRestStore,
-            queryExpr: "*${0}*",
             style: "width: 300px",
             //          query: {"charttype": "A"},
             highlightMatch: "all",
             searchAttr: "label",
             labelAttr: "label",
-            autoComplete: false,
             initialValue: null,
             constructor: function () {
                 this.inherited(arguments);

diff --git a/old/bin/aa.pl b/old/bin/aa.pl
@@ -469,7 +469,7 @@ sub form_header {
 
     $name =
       ( $form->{"select$form->{vc}"} )
-      ? qq|<select data-dojo-type="dijit/form/FilteringSelect" data-dojo-props="queryExpr:'*\${0}*'" id="$form->{vc}" name="$form->{vc}"><option></option>$form->{"select$form->{vc}"}</select>|
+      ? qq|<select data-dojo-type="lsmb/FilteringSelect" id="$form->{vc}" name="$form->{vc}"><option></option>$form->{"select$form->{vc}"}</select>|
       : qq|<input data-dojo-type="dijit/form/TextBox" id="$form->{vc}" name="$form->{vc}" value="$form->{$form->{vc}}" size=35>
                  <a href="erp.pl?action=root#contact.pl?action=add&entity_class=$eclass"
                     id="new-contact" target="_blank">[|
@@ -723,7 +723,7 @@ sub form_header {
               ? $form->format_amount(\%myconfig, $form->parse_amount( \%myconfig, $form->{"amount_$i"} )
                                                   * $form->parse_amount( \%myconfig, $form->{exchangerate} ),2)
               : '')  . qq|</td>
-     <td><select data-dojo-type="dijit/form/FilteringSelect" data-dojo-props="queryExpr:'*\${0}*', autoComplete:false" id="$form->{ARAP}_amount_$i" name="$form->{ARAP}_amount_$i"><option></option>$form->{"select$form->{ARAP}_amount_$i"}</select></td>
+     <td><select data-dojo-type="lsmb/FilteringSelect" id="$form->{ARAP}_amount_$i" name="$form->{ARAP}_amount_$i"><option></option>$form->{"select$form->{ARAP}_amount_$i"}</select></td>
       $description
           $taxformcheck
       $project|;
@@ -894,7 +894,7 @@ sub form_header {
         $column_data{paid} =
 qq|<td align=center><input data-dojo-type="dijit/form/TextBox" name="paid_$i" id="paid_$i" size=11 value=$form->{"paid_$i"}></td>|;
         $column_data{ARAP_paid} =
-qq|<td align=center><select data-dojo-type="dijit/form/FilteringSelect" data-dojo-props="queryExpr:'*\${0}*', autoComplete:false" name="$form->{ARAP}_paid_$i" id="$form->{ARAP}_paid_$i">$form->{"select$form->{ARAP}_paid_$i"}</select></td>|;
+qq|<td align=center><select data-dojo-type="lsmb/FilteringSelect" name="$form->{ARAP}_paid_$i" id="$form->{ARAP}_paid_$i">$form->{"select$form->{ARAP}_paid_$i"}</select></td>|;
         $column_data{exchangerate} = qq|<td align=center>$exchangerate</td>|;
         $column_data{paidfx} = qq|<td align=center>$form->{"paidfx_$i"}</td>|;
         $column_data{datepaid} =

diff --git a/old/bin/ir.pl b/old/bin/ir.pl
@@ -346,7 +346,7 @@ sub form_header {
 |;
 
     if ( $form->{selectvendor} ) {
-        $vendor = qq|<select data-dojo-type="dijit/form/FilteringSelect" data-dojo-props="queryExpr:'*\${0}*'" id=vendor name=vendor><option></option>$form->{selectvendor}</select>|;
+        $vendor = qq|<select data-dojo-type="lsmb/FilteringSelect" id=vendor name=vendor><option></option>$form->{selectvendor}</select>|;
     }
     else {
         $vendor = qq|<input data-dojo-type="dijit/form/TextBox" name=vendor id=vendor value="$form->{vendor}" size=35>

diff --git a/old/bin/is.pl b/old/bin/is.pl
@@ -345,7 +345,7 @@ sub form_header {
 |;
 
     if ( $form->{selectcustomer} ) {
-        $customer = qq|<select data-dojo-type="dijit/form/FilteringSelect" data-dojo-props="queryExpr:'*\${0}*'" id="customer" name="customer"><option></option>$form->{selectcustomer}</select>|;
+        $customer = qq|<select data-dojo-type="lsmb/FilteringSelect" id="customer" name="customer"><option></option>$form->{selectcustomer}</select>|;
     }
     else {
         $customer = qq|<input data-dojo-type="dijit/form/TextBox" id="customer" name="customer" value="$form->{customer}" size="35">

diff --git a/old/bin/oe.pl b/old/bin/oe.pl
@@ -506,7 +506,7 @@ sub form_header {
 <input type=hidden name=oldtransdate value=$form->{oldtransdate}>|;
 
     if ( $form->{"select$form->{vc}"} ) {
-        $vc = qq|<select data-dojo-type="dijit/form/FilteringSelect" data-dojo-props="queryExpr:'*\${0}*'" name="$form->{vc}" id="$form->{vc}"><option></option>$form->{"select$form->{vc}"}</select>|;
+        $vc = qq|<select data-dojo-type="lsmb/FilteringSelect" name="$form->{vc}" id="$form->{vc}"><option></option>$form->{"select$form->{vc}"}</select>|;
     }
     else {
         if ($form->{vc} eq 'vendor'){