From 65e651192e5572f1eafecf3d68bd49e4e97831a4 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Fri, 14 Aug 2020 12:48:29 -0400
Subject: [PATCH] LP1888723 Angular holdings from catalog edit link; 1i8n
 repairs

The 'Edit' link in the copy table within the Angular staff catalog nows
directs users to the Angular volcopy editor.

Remove a number of nested 1i8n declarations.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Ruth Frasur <rfrasur@library.in.gov>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
---
 .../app/staff/cat/volcopy/config.component.html    |  6 ++---
 .../app/staff/cat/volcopy/vol-edit.component.html  | 28 +++++++++++-----------
 .../app/staff/catalog/record/copies.component.html |  9 ++++---
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/config.component.html b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/config.component.html
index 22e75b1713..128e3690c2 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/config.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/config.component.html
@@ -88,7 +88,7 @@
           <ul class="list-group list-group-flush p-2">
             <li class="list-group-item">
               <div class="row">
-                <div class="col-lg-4" i18n>
+                <div class="col-lg-4">
                   <label for="default-classification" i18n>Default Classification</label>
                 </div>
                 <div class="col-lg-8">
@@ -106,7 +106,7 @@
             </li>
             <li class="list-group-item">
               <div class="row">
-                <div class="col-lg-4" i18n>
+                <div class="col-lg-4">
                   <label for="default-prefix" i18n>Default Prefix</label>
                 </div>
                 <div class="col-lg-8">
@@ -127,7 +127,7 @@
             </li>
             <li class="list-group-item">
               <div class="row">
-                <div class="col-lg-4" i18n>
+                <div class="col-lg-4">
                   <label for="default-suffix" i18n>Default Suffix</label>
                 </div>
                 <div class="col-lg-8">
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/vol-edit.component.html b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/vol-edit.component.html
index 6f3db70df5..918b508702 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/vol-edit.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/vol-edit.component.html
@@ -102,13 +102,13 @@
     <span class="font-weight-bold" i18n>Owning Library
       <ng-container *ngIf="expand !== 1">
         <button title="Expand Column" i18n-title 
-          class="material-icon-button" (click)="expand = 1" i18n>
+          class="material-icon-button" (click)="expand = 1">
           &#x2197;
         </button>
       </ng-container>
       <ng-container *ngIf="expand === 1">
         <button title="Shrink Column" i18n-title 
-          class="material-icon-button" (click)="expand = null" i18n>
+          class="material-icon-button" (click)="expand = null">
           &#x2199;
         </button>
       </ng-container>
@@ -121,13 +121,13 @@
     <span class="font-weight-bold" i18n>Classification
       <ng-container *ngIf="expand !== 3">
         <button title="Expand Column" i18n-title 
-          class="material-icon-button" (click)="expand = 3" i18n>
+          class="material-icon-button" (click)="expand = 3">
           &#x2197;
         </button>
       </ng-container>
       <ng-container *ngIf="expand === 3">
         <button title="Shrink Column" i18n-title 
-          class="material-icon-button" (click)="expand = null" i18n>
+          class="material-icon-button" (click)="expand = null">
           &#x2199;
         </button>
       </ng-container>
@@ -137,13 +137,13 @@
     <span class="font-weight-bold" i18n>Prefix
       <ng-container *ngIf="expand !== 4">
         <button title="Expand Column" i18n-title 
-          class="material-icon-button" (click)="expand = 4" i18n>
+          class="material-icon-button" (click)="expand = 4">
           &#x2197;
         </button>
       </ng-container>
       <ng-container *ngIf="expand === 4">
         <button title="Shrink Column" i18n-title 
-          class="material-icon-button" (click)="expand = null" i18n>
+          class="material-icon-button" (click)="expand = null">
           &#x2199;
         </button>
       </ng-container>
@@ -153,13 +153,13 @@
     <span class="font-weight-bold" i18n>Call Number Label
       <ng-container *ngIf="expand !== 5">
         <button title="Expand Column" i18n-title 
-          class="material-icon-button" (click)="expand = 5" i18n>
+          class="material-icon-button" (click)="expand = 5">
           &#x2197;
         </button>
       </ng-container>
       <ng-container *ngIf="expand === 5">
         <button title="Shrink Column" i18n-title
-          class="material-icon-button" (click)="expand = null" i18n>
+          class="material-icon-button" (click)="expand = null">
           &#x2199;
         </button>
       </ng-container>
@@ -169,13 +169,13 @@
     <span class="font-weight-bold" i18n>Suffix
       <ng-container *ngIf="expand !== 6">
         <button title="Expand Column" i18n-title 
-          class="material-icon-button" (click)="expand = 6" i18n>
+          class="material-icon-button" (click)="expand = 6">
           &#x2197;
         </button>
       </ng-container>
       <ng-container *ngIf="expand === 6">
         <button title="Shrink Column" i18n-title
-          class="material-icon-button" (click)="expand = null" i18n>
+          class="material-icon-button" (click)="expand = null">
           &#x2199;
         </button>
       </ng-container>
@@ -194,13 +194,13 @@
     <span class="font-weight-bold" i18n>Barcode
       <ng-container *ngIf="expand !== 8">
         <button title="Expand Column" i18n-title 
-          class="material-icon-button" (click)="expand = 8" i18n>
+          class="material-icon-button" (click)="expand = 8">
           &#x2197;
         </button>
       </ng-container>
       <ng-container *ngIf="expand === 8">
         <button title="Shrink Column" i18n-title
-          class="material-icon-button" (click)="expand = null" i18n>
+          class="material-icon-button" (click)="expand = null">
           &#x2199;
         </button>
       </ng-container>
@@ -213,13 +213,13 @@
     <span class="font-weight-bold" i18n>Part
       <ng-container *ngIf="expand !== 10">
         <button title="Expand Column" i18n-title 
-          class="material-icon-button" (click)="expand = 10" i18n>
+          class="material-icon-button" (click)="expand = 10">
           &#x2197;
         </button>
       </ng-container>
       <ng-container *ngIf="expand === 10">
         <button title="Shrink Column" i18n-title 
-          class="material-icon-button" (click)="expand = null" i18n>
+          class="material-icon-button" (click)="expand = null">
           &#x2199;
         </button>
       </ng-container>
diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.html
index 94795fe84d..417ee60655 100644
--- a/Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.html
@@ -7,12 +7,11 @@
 <ng-template #barcodeTemplate let-copy="row" let-context="userContext">
   <div>{{copy.barcode}}</div>
   <div>
-    <a class="pl-1" target="_blank" 
-      href="/eg/staff/cat/item/{{copy.id}}" i18n>View</a>
+  <a class="pl-1" target="_blank" 
+    href="/eg/staff/cat/item/{{copy.id}}" i18n>View</a>
     <ng-container *ngIf="context.editable(copy)">
-      | 
-      <a class="pl-1" href="javascript:;"
-        (click)="openHoldingsEditor(copy.id)" i18n>Edit</a>
+      | <a class="pl-1" target="_blank"
+        routerLink="/staff/cat/volcopy/attrs/item/{{copy.id}}" i18n>Edit</a>
     </ng-container>
   </div>
 </ng-template>
-- 
2.11.0