LP1929741 Limit to active providers; skip empty name picklist

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html
index db9d35b..c8588b5 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html
@@ -242,7 +242,7 @@
                 <span i18n>{{li.purchase_order().id()}}</span>
               </a>
             </ng-container>
-            <ng-container *ngIf="!picklistId && li.picklist()">
+            <ng-container *ngIf="!picklistId && li.picklist() && li.picklist().name()">
               <span class="ml-1 mr-1" i18n> | </span>
               <a class="label-with-material-icon"
                 title="Selection List" i18n-title 

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/po/create.component.html b/Open-ILS/src/eg2/src/app/staff/acq/po/create.component.html
index 7f7b218..a094da6 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/po/create.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/po/create.component.html
@@ -17,13 +17,16 @@
   </div>
   <div class="form-group">
     <label for="name-input" i18n>Provider</label>
-    <eg-combobox domId="provider-input" [(ngModel)]="provider" idlClass="acqpro">
+    <eg-combobox domId="provider-input" [(ngModel)]="provider" 
+      [idlQueryAnd]="{active: 't'}" idlClass="acqpro">
     </eg-combobox>
   </div>
   <div class="form-group form-check">
     <input type="checkbox" class="form-check-input" 
       [(ngModel)]="prepaymentRequired" id="prepayment-required">
-    <label class="form-check-label" for="prepayment-required" i18n>Prepayment Required</label>
+    <label class="form-check-label" for="prepayment-required" i18n>
+      Prepayment Required
+    </label>
   </div>
   <div class="form-group form-check">
     <input type="checkbox" class="form-check-input" 

diff --git a/Open-ILS/web/js/ui/default/staff/package.json b/Open-ILS/web/js/ui/default/staff/package.json
index f0688bd..3c032d9 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/package.json
+++ b/Open-ILS/web/js/ui/default/staff/package.json
@@ -10,9 +10,9 @@
     "copy-webpack-plugin": "^4.3.0",
     "jasmine-core": "^2.99.1",
     "karma": "^1.7.1",
-    "karma-jasmine": "^1.1.1",
     "karma-chrome-launcher": "^3.1.0",
     "karma-firefox-launcher": "^1.2.0",
+    "karma-jasmine": "^1.1.1",
     "karma-script-launcher": "^1.0.0",
     "karma-spec-reporter": "0.0.32",
     "karma-story-reporter": "^0.3.1",