From: Galen Charlton <gmc@esilibrary.com>
Date: Wed, 4 May 2016 19:13:34 +0000 (-0400)
Subject: oops, went wrong way with merge conflict reconciliation
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=ff8ab013167ec23c8314dc61419691e6fae4dc3e;p=working%2FEvergreen.git

oops, went wrong way with merge conflict reconciliation

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 1d325eb845..5746eee649 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
@@ -1084,9 +1084,13 @@ angular.module('egCoreMod')
     return service;
 }])
 
-function PatronRegCtrl($scope, $routeParams, 
-    $q, $uibModal, $window, egCore, egWorkLog, patronSvc, patronRegSvc,
-    egUnloadPrompt, egAlertDialog) {
+.controller('PatronRegCtrl',
+       ['$scope','$routeParams','$q','$uibModal','$window','egCore',
+        'patronSvc','patronRegSvc','egUnloadPrompt','egAlertDialog',
+        'egWorkLog',
+function($scope , $routeParams , $q , $uibModal , $window , egCore ,
+         patronSvc , patronRegSvc , egUnloadPrompt, egAlertDialog ,
+         egWorkLog) {
 
     $scope.page_data_loaded = false;
     $scope.clone_id = patronRegSvc.clone_id = $routeParams.clone_id;
@@ -1829,10 +1833,4 @@ function PatronRegCtrl($scope, $routeParams,
             }
         });
     }
-}
-
-// This controller may be loaded from different modules (patron edit vs.
-// register new patron), so we have to inject the controller params manually.
-PatronRegCtrl.$inject = ['$scope', '$routeParams', '$q', '$uibModal',
-    '$window', 'egCore', 'egWorkLog', 'patronSvc', 'patronRegSvc',
-    'egUnloadPrompt', 'egAlertDialog'];
+}])