LP#1850547: (follow-up) updates for Angular 10

- update loadChildren entries
- remove nested i18n attributes

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

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/acq/routing.module.ts
index 1305bd0..2230dd7 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/routing.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/acq/routing.module.ts
@@ -3,7 +3,8 @@ import {RouterModule, Routes} from '@angular/router';
 
 const routes: Routes = [
   { path: 'search',
-    loadChildren: './search/acq-search.module#AcqSearchModule'
+    loadChildren: () =>
+      import('./search/acq-search.module').then(m => m.AcqSearchModule)
   }
 ];
 

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.html b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.html
index abd45e5..67c1111 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.html
@@ -7,8 +7,8 @@
     <div class="col-lg-5 form-group form-inline">
       <label i18n>Search for records matching
       <select class="form-inline ml-1 mr-1" id="acq-search-conjunction" [ngModelOptions]="{standalone: true}" [(ngModel)]="searchConjunction">
-        <option i18n select value="all">all</option>
-        <option i18n select value="any">any</option>
+        <option value="all">all</option>
+        <option value="any">any</option>
       </select>
       of the following terms:</label>
     </div>

diff --git a/Open-ILS/src/eg2/src/app/staff/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/routing.module.ts
index ffb95a1..86428ba 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/routing.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/routing.module.ts
@@ -20,7 +20,8 @@ const routes: Routes = [{
     pathMatch: 'full',
   }, {
     path: 'acq',
-    loadChildren : '@eg/staff/acq/routing.module#AcqRoutingModule'
+    loadChildren: () =>
+      import('@eg/staff/acq/routing.module').then(m => m.AcqRoutingModule)
   }, {
     path: 'booking',
     loadChildren: () =>