LP#1942220: link to the Angular PO interface acq search results

Note that this does /not/ follow the setting to display
links to the "experimental" Angular acquisitions interfaces; my
intention is to replace that with a different setting that,
when enabled, provides links to the Dojo interfaces from the
corresponding Angular interfaces.

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

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 9b39ef3..741289d 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
@@ -18,8 +18,9 @@
   </ng-container>
 
   <ng-template #legacyId>
+
     <a *ngIf="lineitem.purchase_order()" 
-      href="/eg/staff/acq/legacy/po/view/{{lineitem.purchase_order().id()}}?focus_li={{lineitem.id()}}"
+      routerLink="/staff/acq/po/{{lineitem.purchase_order().id()}}" fragment="{{lineitem.id()}}"
       target="_blank">
       {{lineitem.id()}}
     </a>
@@ -41,7 +42,7 @@
   </ng-container>
   <ng-template #legacyPo>
     <a *ngIf="lineitem.purchase_order()" 
-      href="/eg/staff/acq/legacy/po/view/{{lineitem.purchase_order().id()}}?focus_li={{lineitem.id()}}"
+      routerLink="/staff/acq/po/{{lineitem.purchase_order().id()}}" fragment="{{lineitem.id()}}"
       target="_blank">
       {{lineitem.purchase_order().name()}}
     </a>
@@ -103,7 +104,7 @@
           target="_blank" i18n>Purchase Order</a>
       </ng-container>
       <ng-template #legacyPo2>
-        <a href="/eg/staff/acq/legacy/po/view/{{lineitem.purchase_order().id()}}"
+        <a routerLink="/staff/acq/po/{{lineitem.purchase_order().id()}}"
           target="_blank" i18n>Purchase Order</a>
       </ng-template>
     </li>

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 6798708..456027e 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
@@ -10,8 +10,7 @@
     </a>
   </ng-container>
   <ng-template #legacyPo>
-    <a href="/eg/staff/acq/legacy/po/view/{{purchaseorder.id()}}"
-      target="_blank">
+    <a routerLink="/staff/acq/po/{{purchaseorder.id()}}" target="_blank">
       {{purchaseorder.name()}}
     </a>
   </ng-template>

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/purchase-order-results.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/search/purchase-order-results.component.ts
index b4556d8..7e583bf 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/search/purchase-order-results.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/acq/search/purchase-order-results.component.ts
@@ -55,7 +55,7 @@ export class PurchaseOrderResultsComponent implements OnInit {
     }
 
     showRow(row: any) {
-        window.open('/eg/staff/acq/legacy/po/view/' + row.id(), '_blank');
+        window.open('/eg2/staff/acq/po/' + row.id(), '_blank');
     }
 
     doSearch(search: AcqSearch) {