LP1849212: more simplified editor

Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>

diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/simplified-editor/simplified-editor.component.html b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/simplified-editor/simplified-editor.component.html
index 52acfc0..c6bbf23 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/simplified-editor/simplified-editor.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/simplified-editor/simplified-editor.component.html
@@ -1,11 +1,11 @@
-<ng-container *ngIf="editor">
+<ng-container *ngIf="editor && subfieldLabels">
   <form [formGroup]="editor">
     <ng-container *ngFor="let field of fields">
       <div class="row" *ngFor="let subfield of field.subfields">
         <ng-container *ngIf="!subfield[1]">
           <div class="col-lg-3">
             <label for="{{idPrefix}}-{{field.tag}}{{subfield[0]}}">
-              {{subfieldLabels[field.tag][subfield[0]]}}
+              {{subfieldLabels[field.tag + subfield[0]]}}
             </label>
           </div>
           <div class="col-lg-9">

diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/simplified-editor/simplified-editor.component.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/simplified-editor/simplified-editor.component.ts
index 8ac4dd4..9cb39a4 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/simplified-editor/simplified-editor.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/simplified-editor/simplified-editor.component.ts
@@ -24,7 +24,7 @@ export class MarcSimplifiedEditorComponent implements AfterViewInit, OnInit {
     idPrefix: string;
 
     fieldIndex = 0;
-    subfieldLabels: {[tag: string]: {[subfield: string]: string}};
+    subfieldLabels = {};
 
     addField: (field: MarcField) => void;
 
@@ -51,7 +51,7 @@ export class MarcSimplifiedEditorComponent implements AfterViewInit, OnInit {
         this.tagTable.loadTags({marcRecordType: 'biblio', ffType: 'BKS'}).then(table => {
             this.fields.forEach((field) => {
                 field.subfields.forEach((subfield) => {
-                    this.subfieldLabels[field.tag][subfield[0]] = table.getSubfieldLabel(field.tag, subfield[0]);
+                    this.subfieldLabels[field.tag + subfield[0]] = table.getSubfieldLabel(field.tag, subfield[0]);
                 })
             });
         });