Flesh PO and SL, and display their names rather than IDs because sorting is by name

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.service.ts b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.service.ts
index 2474f71..88ac7ca 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.service.ts
+++ b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.service.ts
@@ -54,6 +54,8 @@ const searchOptions = {
         flesh_creator: true,
         flesh_editor: true,
         flesh_selector: true,
+        flesh_po: true,
+        flesh_pl: true,
     },
     purchase_order: {
         no_flesh_cancel_reason: true,

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/lineitem-results.component.html b/Open-ILS/src/eg2/src/app/staff/acq/search/lineitem-results.component.html
index 9d57831..607a316 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/search/lineitem-results.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/search/lineitem-results.component.html
@@ -3,16 +3,30 @@
   defaultSearchSetting="eg.acq.search.default.lineitems"></eg-acq-search-form>
 
 <ng-template #idTmpl let-lineitem="row">
-  <a *ngIf="lineitem.purchase_order()" href="/eg/staff/acq/legacy/po/view/{{lineitem.purchase_order()}}?focus_li={{lineitem.id()}}"
+  <a *ngIf="lineitem.purchase_order()" href="/eg/staff/acq/legacy/po/view/{{lineitem.purchase_order().id()}}?focus_li={{lineitem.id()}}"
      target="_blank">
     {{lineitem.id()}}
   </a>
-  <a *ngIf="lineitem.picklist() && !lineitem.purchase_order()" href="/eg/staff/acq/legacy/picklist/view/{{lineitem.picklist()}}?focus_li={{lineitem.id()}}"
+  <a *ngIf="lineitem.picklist() && !lineitem.purchase_order()" href="/eg/staff/acq/legacy/picklist/view/{{lineitem.picklist().id()}}?focus_li={{lineitem.id()}}"
      target="_blank">
     {{lineitem.id()}}
   </a>
 </ng-template>
 
+<ng-template #poTmpl let-lineitem="row">
+  <a *ngIf="lineitem.purchase_order()" href="/eg/staff/acq/legacy/po/view/{{lineitem.purchase_order().id()}}?focus_li={{lineitem.id()}}"
+     target="_blank">
+    {{lineitem.purchase_order().name()}}
+  </a>
+</ng-template>
+
+<ng-template #plTmpl let-lineitem="row">
+  <a *ngIf="lineitem.picklist()" href="/eg/staff/acq/legacy/picklist/view/{{lineitem.picklist().id()}}?focus_li={{lineitem.id()}}"
+     target="_blank">
+    {{lineitem.picklist().name()}}
+  </a>
+</ng-template>
+
 <ng-template #liAttrTmpl let-lineitem="row" let-col="col">
   <ng-container *ngFor="let lia of lineitem.attributes()">
     <ng-container *ngIf="lia.attr_name() === col.path">
@@ -36,7 +50,7 @@
     <li><a href="/eg/staff/acq/legacy/lineitem/worksheet/{{lineitem.id()}}"
            target="_blank" i18n>Worksheet</a></li>
     <li *ngIf="lineitem.purchase_order()">
-      <a href="/eg/staff/acq/legacy/po/view/{{lineitem.purchase_order()}}"
+      <a href="/eg/staff/acq/legacy/po/view/{{lineitem.purchase_order().id()}}"
           target="_blank" i18n>Purchase Order</a></li>
     <li><a href="/eg/staff/acq/requests/lineitem/{{lineitem.id()}}"
            target="_blank" i18n>Requests</a></li>
@@ -47,7 +61,7 @@
       <a routerLink="/staff/cat/vandelay/queue/bib/{{lineitem.queued_record().queue()}}"
         target="_blank" i18n>Queue</a></li>
     <li *ngIf="lineitem.picklist()">
-      <a href="/eg/staff/acq/legacy/picklist/view/{{lineitem.picklist()}}"
+      <a href="/eg/staff/acq/legacy/picklist/view/{{lineitem.picklist().id()}}"
         target="_blank" i18n>Selection List</a></li>
   </ul>
 </ng-template>
@@ -69,5 +83,7 @@
   <eg-grid-column [asyncSupportsEmptyTermClick]="true" path="claim_policy" [sortable]="false"></eg-grid-column>
   <eg-grid-column [asyncSupportsEmptyTermClick]="true" i18n-label label="Status" path="state" [disableTooltip]="true"></eg-grid-column>
   <eg-grid-column path="estimated_unit_price" [disableTooltip]="true"></eg-grid-column>
+  <eg-grid-column path="purchase_order" [cellTemplate]="poTmpl" [disableTooltip]="true" [hidden]="true"></eg-grid-column>
+  <eg-grid-column path="picklist" [cellTemplate]="plTmpl" [disableTooltip]="true" [hidden]="true"></eg-grid-column>
   <eg-grid-column [asyncSupportsEmptyTermClick]="true" path="cancel_reason" [hidden]="true"></eg-grid-column>
 </eg-grid>