From b03c69699a4629b6b74fe13a5be7769de746cd53 Mon Sep 17 00:00:00 2001 From: Mike Rylander Date: Fri, 4 Nov 2016 13:55:23 -0400 Subject: [PATCH] Allow system printing to work normally by delaying stylesheet inclusion Signed-off-by: Mike Rylander --- Open-ILS/src/templates/staff/base.tt2 | 1 - Open-ILS/web/js/ui/default/staff/services/print.js | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Open-ILS/src/templates/staff/base.tt2 b/Open-ILS/src/templates/staff/base.tt2 index 7f4c64a958..93ada15033 100644 --- a/Open-ILS/src/templates/staff/base.tt2 +++ b/Open-ILS/src/templates/staff/base.tt2 @@ -20,7 +20,6 @@ [% END %] - diff --git a/Open-ILS/web/js/ui/default/staff/services/print.js b/Open-ILS/web/js/ui/default/staff/services/print.js index fa60193683..960eb1d2b8 100644 --- a/Open-ILS/web/js/ui/default/staff/services/print.js +++ b/Open-ILS/web/js/ui/default/staff/services/print.js @@ -6,8 +6,8 @@ angular.module('egCoreMod') .factory('egPrint', - ['$q','$window','$timeout','$http','egHatch','egAuth','egIDL','egOrg', -function($q , $window , $timeout , $http , egHatch , egAuth , egIDL , egOrg) { + ['$q','$window','$timeout','$http','egHatch','egAuth','egIDL','egOrg','egEnv', +function($q , $window , $timeout , $http , egHatch , egAuth , egIDL , egOrg , egEnv) { var service = {}; @@ -160,14 +160,14 @@ function($q , $window , $timeout , $http , egHatch , egAuth , egIDL , egOrg) { scope.elm = element; }, controller : - ['$scope','$q','$window','$timeout','egHatch','egPrint', - function($scope , $q , $window , $timeout , egHatch , egPrint) { + ['$scope','$q','$window','$timeout','egHatch','egPrint','egEnv', + function($scope , $q , $window , $timeout , egHatch , egPrint , egEnv) { egPrint.ingest_print_content = function(type, content, printScope) { if (type == 'text/csv' || type == 'text/plain') { // preserve newlines, spaces, etc. - content = '

' + content + '

'; + content = '

' + content + '

'; } $scope.elm.html(content); -- 2.11.0