From aa57b541c186a753c417a6cdc318f8417b9ee52a Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Tue, 6 Mar 2018 18:34:34 +0000 Subject: [PATCH] LP#1626157 Downgrade ang2 Title service to fix titles Signed-off-by: Bill Erickson --- Open-ILS/eg2-src/src/app/migration.module.ts | 6 +++++- Open-ILS/web/js/ui/default/staff/circ/checkin/app.js | 7 +++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Open-ILS/eg2-src/src/app/migration.module.ts b/Open-ILS/eg2-src/src/app/migration.module.ts index c5fa3ce1d5..2c0c73f465 100644 --- a/Open-ILS/eg2-src/src/app/migration.module.ts +++ b/Open-ILS/eg2-src/src/app/migration.module.ts @@ -14,7 +14,10 @@ import {CookieModule} from 'ngx-cookie'; // import CookieMonster import {UpgradeModule, downgradeInjectable, downgradeComponent} from '@angular/upgrade/static'; -// Import and 'provide' globally required services. +// Import and provide some Angular built-ins +import {Title} from '@angular/platform-browser'; + +// Import and 'provide' globally required Evergreen services. import {EgEventService} from '@eg/core/event'; import {EgStoreService} from '@eg/core/store'; import {EgIdlService} from '@eg/core/idl'; @@ -67,6 +70,7 @@ export class EgMigrationModule { downgradeComponent({ component: HeroDetailComponent }) */ .factory('eg2Net', downgradeInjectable(EgNetService)) + .factory('ng2Title', downgradeInjectable(Title)) ; this.upgrade.bootstrap(document.body, [myWin.ang1PageApp]); diff --git a/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js b/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js index fff7586270..0c7b1bbd8c 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js +++ b/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js @@ -35,13 +35,16 @@ angular.module('egCheckinApp', ['ngRoute', 'ui.bootstrap', */ .controller('CheckinCtrl', ['$scope','$q','$window','$location', '$timeout','egCore', - 'checkinSvc','egGridDataProvider','egCirc','egItem','eg2Net', + 'checkinSvc','egGridDataProvider','egCirc','egItem','eg2Net','ng2Title', function($scope , $q , $window , $location , $timeout , egCore , - checkinSvc , egGridDataProvider , egCirc, itemSvc , eg2Net) { + checkinSvc , egGridDataProvider , egCirc, itemSvc , eg2Net , ng2Title) { + // TODO: TESTING eg2Net.request('open-ils.actor', 'opensrf.system.echo', 'Hello, Ang2') .subscribe(function(res) {console.log('eg2Net returned ' + res)}); + ng2Title.setTitle('Checkin'); // TODO: TESTING + $scope.focusMe = true; $scope.checkins = checkinSvc.checkins; var today = new Date(); -- 2.11.0