From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Tue, 14 Jul 2020 15:33:11 +0000 (-0400)
Subject: fix does-not-contain operator for linked fields
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Fcollab%2Fgmcharlt%2Fangular-acq-search-rebased1;p=working%2FEvergreen.git

fix does-not-contain operator for linked fields

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.html b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.html
index 4d478a44c7..a5c697a9fe 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.html
@@ -84,12 +84,12 @@
         </eg-org-select>
         <ng-container *ngIf="searchTermDatatypes[t.field] == 'link'">
           <ng-container *ngIf="searchFieldLinkedClasses[t.field] === 'acqpro'">
-            <eg-combobox *ngIf="t.op != '__fuzzy'"
+            <eg-combobox *ngIf="t.op != '__fuzzy' && t.op != '__not,__fuzzy'"
               [idlClass]="searchFieldLinkedClasses[t.field]"
               [selectedId]="t.value1"
               (onChange)="t.value1 = $event ? $event.id : ''">
             </eg-combobox>
-            <input [ngModelOptions]="{standalone: true}" [(ngModel)]="t.value1" type="text" *ngIf="t.op == '__fuzzy'" class="form-control" />
+            <input [ngModelOptions]="{standalone: true}" [(ngModel)]="t.value1" type="text" *ngIf="t.op == '__fuzzy' || t.op == '__not,__fuzzy'" class="form-control" />
           </ng-container>
           <ng-container *ngIf="searchFieldLinkedClasses[t.field] === 'au'">
             <eg-combobox *ngIf="!t.op.includes('__fuzzy')"
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.ts
index f1b9bfe003..690d6a2a24 100644
--- a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.ts
@@ -193,7 +193,9 @@ export class AcqSearchFormComponent implements OnInit, AfterViewInit, OnChanges
             term.value2 = '';
         }
         if (this.searchTermDatatypes[term.field] === 'link') {
-            if (oldOp === '__fuzzy' || term.op === '__fuzzy') {
+            if (oldOp === '__fuzzy' || term.op === '__fuzzy' ||
+                oldOp === '__not,__fuzzy' || term.op === '__not,__fuzzy'
+               ) {
                 term.value1 = '';
                 term.value2 = '';
             }