From 9174fc7d009aefed940d032f34098be89dba5dfb Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Thu, 30 Jul 2020 12:23:15 -0400
Subject: [PATCH] LP1872867 Staff catalog filters use search labels

The Angular staff catalog now displays the search_label value for all of
the coded-value-map filters (search format, item type, etc.) when
available.  It falls back to the 'value' field when no search_label exists.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 .../app/staff/catalog/search-form.component.html   | 33 ++++++++++++++++------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.html
index 920b008074..49ee9aae84 100644
--- a/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.html
@@ -21,8 +21,9 @@
               <div *ngIf="idx == 0">
                 <select class="form-control" [(ngModel)]="context.termSearch.format">
                   <option i18n value=''>All Formats</option>
-                  <option *ngFor="let fmt of ccvmMap.search_format"
-                    value="{{fmt.code()}}">{{fmt.value()}}</option>
+                  <option *ngFor="let fmt of ccvmMap.search_format" value="{{fmt.code()}}">
+                    {{fmt.search_label() || fmt.value()}}
+                  </option>
                 </select>
               </div>
               <div *ngIf="idx > 0">
@@ -142,7 +143,9 @@
                 [(ngModel)]="context.termSearch.ccvmFilters.item_type">
                 <option value='' i18n>All Item Types</option>
                 <option *ngFor="let itemType of ccvmMap.item_type"
-                  value="{{itemType.code()}}">{{itemType.value()}}</option>
+                  value="{{itemType.code()}}">
+                  {{itemType.search_label() || itemType.value()}}
+                  </option>
               </select>
             </div>
             <div class="col-lg-3">
@@ -150,7 +153,9 @@
                 [(ngModel)]="context.termSearch.ccvmFilters.item_form">
                 <option value='' i18n>All Item Forms</option>
                 <option *ngFor="let itemForm of ccvmMap.item_form"
-                  value="{{itemForm.code()}}">{{itemForm.value()}}</option>
+                  value="{{itemForm.code()}}">
+                  {{itemForm.search_label() || itemForm.value()}}
+                </option>
               </select>
             </div>
             <div class="col-lg-3">
@@ -158,7 +163,9 @@
                 [(ngModel)]="context.termSearch.ccvmFilters.item_lang" multiple="true">
                 <option value='' i18n>All Languages</option>
                 <option *ngFor="let lang of ccvmMap.item_lang"
-                  value="{{lang.code()}}">{{lang.value()}}</option>
+                  value="{{lang.code()}}">
+                  {{lang.search_label() || lang.value()}}
+                </option>
               </select>
             </div>
             <div class="col-lg-3">
@@ -166,7 +173,9 @@
                 [(ngModel)]="context.termSearch.ccvmFilters.audience" multiple="true">
                 <option value='' i18n>All Audiences</option>
                 <option *ngFor="let audience of ccvmMap.audience"
-                  value="{{audience.code()}}">{{audience.value()}}</option>
+                  value="{{audience.code()}}">
+                  {{audience.search_label() || audience.value()}}
+                </option>
               </select>
             </div>
           </div>
@@ -176,7 +185,9 @@
                 [(ngModel)]="context.termSearch.ccvmFilters.vr_format" multiple="true">
                 <option value='' i18n>All Video Formats</option>
                 <option *ngFor="let vrFormat of ccvmMap.vr_format"
-                  value="{{vrFormat.code()}}">{{vrFormat.value()}}</option>
+                  value="{{vrFormat.code()}}">
+                  {{vrFormat.search_label() || vrFormat.value()}}
+                </option>
               </select>
             </div>
             <div class="col-lg-3">
@@ -184,7 +195,9 @@
                 [(ngModel)]="context.termSearch.ccvmFilters.bib_level" multiple="true">
                 <option value='' i18n>All Bib Levels</option>
                 <option *ngFor="let bibLevel of ccvmMap.bib_level"
-                  value="{{bibLevel.code()}}">{{bibLevel.value()}}</option>
+                  value="{{bibLevel.code()}}">
+                  {{bibLevel.search_label() || bibLevel.value()}}
+                </option>
               </select>
             </div>
             <div class="col-lg-3">
@@ -192,7 +205,9 @@
                 [(ngModel)]="context.termSearch.ccvmFilters.lit_form" multiple="true">
                 <option value='' i18n>All Literary Forms</option>
                 <option *ngFor="let litForm of ccvmMap.lit_form"
-                  value="{{litForm.code()}}">{{litForm.value()}}</option>
+                  value="{{litForm.code()}}">
+                  {{litForm.search_label() || litForm.value()}}
+                </option>
               </select>
             </div>
             <div class="col-lg-3">
-- 
2.11.0