Fix thinko to allow Currency Type searching (30)

Signed-off-by: Mike Rylander <mrylander@gmail.com>

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider-search-form.component.html b/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider-search-form.component.html
index 751f89d..c7fa301 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider-search-form.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider-search-form.component.html
@@ -29,7 +29,7 @@
       <input i18n-placeholder placeholder="Provider Phone" [ngModelOptions]="{standalone: true}" [(ngModel)]="providerPhone" type="text" class="form-control" />
     </div>
     <div class="col-lg-2">
-      <eg-combobox i18n-placeholder placeholder="Currency" idlClass="acqct" (onChange)="providerCurrencyType = $event ? $event.code : null"></eg-combobox>
+      <eg-combobox i18n-placeholder placeholder="Currency" idlClass="acqct" (onChange)="providerCurrencyType = $event ? $event.id : null" [asyncSupportsEmptyTermClick]="true"></eg-combobox>
     </div>
   </div>
 

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider-search-form.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider-search-form.component.ts
index 9f0b522..5a255f8 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider-search-form.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider-search-form.component.ts
@@ -92,7 +92,7 @@ export class AcqProviderSearchFormComponent implements OnInit, AfterViewInit {
             });
         }
         if (this.providerCurrencyType) {
-            searchTerms.push({ classes: ['acqpro'], fields: ['currency_type'], op: 'ilike', value: this.providerCurrencyType });
+            searchTerms.push({ classes: ['acqpro'], fields: ['currency_type'], op: '=', value: this.providerCurrencyType });
         }
         if (this.providerSAN) {
             searchTerms.push({ classes: ['acqpro'], fields: ['san'], op: 'ilike', value: this.providerSAN });

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-record.service.ts b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-record.service.ts
index be2b5e6..792e31f 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-record.service.ts
+++ b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-record.service.ts
@@ -42,7 +42,7 @@ export class ProviderRecordService {
                 flesh_fields: { acqpro:  [
                                            'attributes', 'holdings_subfields', 'contacts',
                                            'addresses', 'provider_notes',
-                                           'edi_accounts',
+                                           'edi_accounts', 'currency_type'
                                          ],
                                 acqpa:   ['provider'],
                                 acqpc:   ['provider','addresses'],