From: Bill Erickson Date: Mon, 5 Mar 2018 17:57:01 +0000 (+0000) Subject: LP#1626157 per-page setup ; downgrade service example X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=e24dd47249cd889533b7fa49c3d432403758b2be;p=working%2FEvergreen.git LP#1626157 per-page setup ; downgrade service example Signed-off-by: Bill Erickson --- diff --git a/Open-ILS/eg2-src/src/app/app.module.ts b/Open-ILS/eg2-src/src/app/app.module.ts index e069594d96..b992515d8e 100644 --- a/Open-ILS/eg2-src/src/app/app.module.ts +++ b/Open-ILS/eg2-src/src/app/app.module.ts @@ -9,7 +9,8 @@ import {NgbModule} from '@ng-bootstrap/ng-bootstrap'; // ng-bootstrap import {CookieModule} from 'ngx-cookie'; // import CookieMonster // XXX required for multi-mode -import {UpgradeModule} from '@angular/upgrade/static'; +import {UpgradeModule, downgradeInjectable} from '@angular/upgrade/static'; + import {Router} from '@angular/router'; import {EgBaseComponent} from './app.component'; @@ -67,24 +68,25 @@ export class EgBaseModule { ) {} ngDoBootstrap() { - console.log('ngDoBootstrap()'); + let myWin: any = window; // make TS happy - let myWin: any = window; + console.log(`Ang2 loading Ang1 app ${myWin.ang1PageApp}`); if (!myWin.ang1PageApp) { console.error('NO PAGE APP DEFINED'); return; } - /* - angular.module(myWin.ang1PageApp).directive('heroDetail', - downgradeComponent({ component: HeroDetailComponent }) - ); - */ + angular.module(myWin.ang1PageApp) + /* + .directive('heroDetail', + downgradeComponent({ component: HeroDetailComponent }) + */ + .factory('eg2Net', downgradeInjectable(EgNetService)) + ; // some of our ang1 apps are not strict-di compliant :( this.upgrade.bootstrap(document.body, [myWin.ang1PageApp]); - //this.upgrade.bootstrap(document.body, [myWin.ang1PageApp], { strictDi: true }); } } diff --git a/Open-ILS/src/templates/staff/base.tt2 b/Open-ILS/src/templates/staff/base.tt2 index a16acc2e6c..05c16241b6 100644 --- a/Open-ILS/src/templates/staff/base.tt2 +++ b/Open-ILS/src/templates/staff/base.tt2 @@ -1,15 +1,17 @@ [%- PROCESS 'staff/config.tt2' %] + [%- IF NOT ctx.is_ang2_app %] + [%- IF ctx.page_app %] ng-app="[% ctx.page_app %]"[% END -%] + [%- IF ctx.page_ctrl %] ng-controller="[% ctx.page_ctrl %]"[% END %] + [% END %]> - + [% IF ctx.is_ang2_app AND ctx.page_app %] + + [% END %]