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 <berickxx@gmail.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>

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 2d484be..0e01761 100644 (file)
--- 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 49306f0..2f7c208 100644 (file)
--- 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() {});
 
-