flesh some columns for purchase order grid

Signed-off-by: Jason Etheridge <jason@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 73c3791..9e21871 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
@@ -44,6 +44,10 @@ const searchOptions = {
     },
     purchase_order: {
         no_flesh_cancel_reason: true,
+        flesh_provider: true,
+        flesh_owner: true,
+        flesh_creator: true,
+        flesh_editor: true
     },
     picklist: {
         flesh_lineitem_count: true,

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/purchase-order-results.component.html b/Open-ILS/src/eg2/src/app/staff/acq/search/purchase-order-results.component.html
index 3b6e7fa..ee05ad9 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/search/purchase-order-results.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/search/purchase-order-results.component.html
@@ -6,9 +6,9 @@
 </ng-template>
 
 <ng-template #providerTmpl let-purchaseorder="row">
-  <a href="/eg/conify/global/acq/provider/{{purchaseorder.provider()}}"
+  <a href="/eg/conify/global/acq/provider/{{purchaseorder.provider().id()}}"
      target="_blank">
-    {{purchaseorder.provider()}}
+    {{purchaseorder.provider().code()}}
   </a>
 </ng-template>
 

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Financials.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Financials.pm
index e66e648..062a9d1 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Financials.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Financials.pm
@@ -1015,6 +1015,15 @@ sub retrieve_purchase_order_impl {
     if ($options->{"flesh_provider"}) {
         push @{$flesh->{"flesh_fields"}->{"acqpo"}}, "provider";
     }
+    if ($options->{"flesh_owner"}) {
+        push @{$flesh->{"flesh_fields"}->{"acqpo"}}, "owner";
+    }
+    if ($options->{"flesh_creator"}) {
+        push @{$flesh->{"flesh_fields"}->{"acqpo"}}, "creator";
+    }
+    if ($options->{"flesh_editor"}) {
+        push @{$flesh->{"flesh_fields"}->{"acqpo"}}, "editor";
+    }
 
     push (@{$flesh->{flesh_fields}->{acqpo}}, 'po_items') if $options->{flesh_po_items};