From 34f53d9225556ec4553e5ddc4c5ed6fd09bd7b72 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 9 Mar 2016 08:38:41 -0500 Subject: [PATCH] LP#1554714 Patron reg 1.5 controller consolidation Angular 1.4+ requires that each controller be instantiated via the module.controller() function. No more global functions. The patron reg. controller, shared by 2 different modules, was defined as a global function. Resolve this by hanging it off the core module (when loaded). Signed-off-by: Bill Erickson Signed-off-by: Galen Charlton --- Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js | 15 +++++++-------- Open-ILS/web/js/ui/default/staff/circ/patron/register.js | 1 - 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js index 2d484be90f..0e01761006 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js +++ b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js @@ -1076,11 +1076,13 @@ angular.module('egCoreMod') } return service; -}]); +}]) - -function PatronRegCtrl($scope, $routeParams, $q, $uibModal, $window, - egCore, patronSvc, patronRegSvc, egUnloadPrompt, egAlertDialog) { +.controller('PatronRegCtrl', + ['$scope','$routeParams','$q','$uibModal','$window','egCore', + 'patronSvc','patronRegSvc','egUnloadPrompt','egAlertDialog', +function($scope , $routeParams , $q , $uibModal , $window , egCore , + patronSvc , patronRegSvc , egUnloadPrompt, egAlertDialog) { $scope.page_data_loaded = false; $scope.clone_id = patronRegSvc.clone_id = $routeParams.clone_id; @@ -1812,8 +1814,5 @@ function PatronRegCtrl($scope, $routeParams, $q, $uibModal, $window, } }); } -} - -PatronRegCtrl.$inject = ['$scope', '$routeParams', '$q', '$uibModal', - '$window', 'egCore', 'patronSvc', 'patronRegSvc', 'egUnloadPrompt', 'egAlertDialog']; +}]) diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/register.js b/Open-ILS/web/js/ui/default/staff/circ/patron/register.js index 49306f015e..2f7c2088f1 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/patron/register.js +++ b/Open-ILS/web/js/ui/default/staff/circ/patron/register.js @@ -44,4 +44,3 @@ angular.module('egPatronRegApp', ['ui.bootstrap','ngRoute','egCoreMod', 'egUiMod // dummy service so standalone patron editor can reference it .factory('patronSvc', function() {}); - -- 2.11.0