LP#1554714 angular-bootstrap 1.4 uibModal migration
authorBill Erickson <berickxx@gmail.com>
Tue, 8 Mar 2016 21:12:48 +0000 (16:12 -0500)
committerBill Erickson <berickxx@gmail.com>
Fri, 22 Apr 2016 13:52:59 +0000 (09:52 -0400)
angular-bootstrap's $modal module is now known as $uibModal.  Ditto
$uibModalInstance.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
16 files changed:
Open-ILS/web/js/ui/default/staff/cat/bucket/copy/app.js
Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js
Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
Open-ILS/web/js/ui/default/staff/cat/services/holdings.js
Open-ILS/web/js/ui/default/staff/cat/services/marcedit.js
Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
Open-ILS/web/js/ui/default/staff/cat/z3950/app.js
Open-ILS/web/js/ui/default/staff/circ/patron/app.js
Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
Open-ILS/web/js/ui/default/staff/circ/patron/checkout.js
Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js
Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
Open-ILS/web/js/ui/default/staff/circ/services/billing.js
Open-ILS/web/js/ui/default/staff/circ/services/circ.js
Open-ILS/web/js/ui/default/staff/circ/services/holds.js
Open-ILS/web/js/ui/default/staff/services/ui.js

index da8d00d..e3b068e 100644 (file)
@@ -211,9 +211,9 @@ angular.module('egCatCopyBuckets',
  * Hosts functions needed by all controllers.
  */
 .controller('CopyBucketCtrl',
-       ['$scope','$location','$q','$timeout','$modal',
+       ['$scope','$location','$q','$timeout','$uibModal',
         '$window','egCore','bucketSvc',
-function($scope,  $location,  $q,  $timeout,  $modal,  
+function($scope,  $location,  $q,  $timeout,  $uibModal,  
          $window,  egCore,  bucketSvc) {
 
     $scope.bucketSvc = bucketSvc;
@@ -264,13 +264,13 @@ function($scope,  $location,  $q,  $timeout,  $modal,
     }
 
     $scope.openCreateBucketDialog = function() {
-        $modal.open({
+        $uibModal.open({
             templateUrl: './cat/bucket/copy/t_bucket_create',
             controller: 
-                ['$scope', '$modalInstance', function($scope, $modalInstance) {
+                ['$scope', '$uibModalInstance', function($scope, $uibModalInstance) {
                 $scope.focusMe = true;
-                $scope.ok = function(args) { $modalInstance.close(args) }
-                $scope.cancel = function () { $modalInstance.dismiss() }
+                $scope.ok = function(args) { $uibModalInstance.close(args) }
+                $scope.cancel = function () { $uibModalInstance.dismiss() }
             }]
         }).result.then(function (args) {
             if (!args || !args.name) return;
@@ -288,10 +288,10 @@ function($scope,  $location,  $q,  $timeout,  $modal,
     }
 
     $scope.openEditBucketDialog = function() {
-        $modal.open({
+        $uibModal.open({
             templateUrl: './cat/bucket/copy/t_bucket_edit',
             controller: 
-                ['$scope', '$modalInstance', function($scope, $modalInstance) {
+                ['$scope', '$uibModalInstance', function($scope, $uibModalInstance) {
                 $scope.focusMe = true;
                 $scope.args = {
                     name : bucketSvc.currentBucket.name(),
@@ -304,9 +304,9 @@ function($scope,  $location,  $q,  $timeout,  $modal,
                     args.pub = args.pub ? 't' : 'f';
                     // close the dialog after edit has completed
                     bucketSvc.editBucket(args).then(
-                        function() { $modalInstance.close() });
+                        function() { $uibModalInstance.close() });
                 }
-                $scope.cancel = function () { $modalInstance.dismiss() }
+                $scope.cancel = function () { $uibModalInstance.dismiss() }
             }]
         })
     }
@@ -314,13 +314,13 @@ function($scope,  $location,  $q,  $timeout,  $modal,
     // opens the delete confirmation and deletes the current
     // bucket if the user confirms.
     $scope.openDeleteBucketDialog = function() {
-        $modal.open({
+        $uibModal.open({
             templateUrl: './cat/bucket/copy/t_bucket_delete',
             controller : 
-                ['$scope', '$modalInstance', function($scope, $modalInstance) {
+                ['$scope', '$uibModalInstance', function($scope, $uibModalInstance) {
                 $scope.bucket = function() { return bucketSvc.currentBucket }
-                $scope.ok = function() { $modalInstance.close() }
-                $scope.cancel = function() { $modalInstance.dismiss() }
+                $scope.ok = function() { $uibModalInstance.close() }
+                $scope.cancel = function() { $uibModalInstance.dismiss() }
             }]
         }).result.then(function () {
             bucketSvc.deleteBucket(bucketSvc.currentBucket.id())
@@ -333,17 +333,17 @@ function($scope,  $location,  $q,  $timeout,  $modal,
 
     // retrieves the requested bucket by ID
     $scope.openSharedBucketDialog = function() {
-        $modal.open({
+        $uibModal.open({
             templateUrl: './cat/bucket/copy/t_load_shared',
             controller :
-                ['$scope', '$modalInstance', function($scope, $modalInstance) {
+                ['$scope', '$uibModalInstance', function($scope, $uibModalInstance) {
                 $scope.focusMe = true;
                 $scope.ok = function(args) {
                     if (args && args.id) {
-                        $modalInstance.close(args.id)
+                        $uibModalInstance.close(args.id)
                     }
                 }
-                $scope.cancel = function() { $modalInstance.dismiss() }
+                $scope.cancel = function() { $uibModalInstance.dismiss() }
             }]
         }).result.then(function(id) {
             // RecordBucketCtrl $scope is not inherited by the
@@ -401,9 +401,9 @@ function($scope,  $routeParams,  bucketSvc , egGridDataProvider,   egCore) {
 }])
 
 .controller('ViewCtrl',
-       ['$scope','$q','$routeParams','$timeout','$window','$modal','bucketSvc','egCore','egUser',
+       ['$scope','$q','$routeParams','$timeout','$window','$uibModal','bucketSvc','egCore','egUser',
         'egConfirmDialog',
-function($scope,  $q , $routeParams , $timeout , $window , $modal , bucketSvc , egCore , egUser ,
+function($scope,  $q , $routeParams , $timeout , $window , $uibModal , bucketSvc , egCore , egUser ,
          egConfirmDialog) {
 
     $scope.setTab('view');
@@ -482,12 +482,12 @@ function($scope,  $q , $routeParams , $timeout , $window , $modal , bucketSvc ,
 
         if (copy_list.length == 0) return;
 
-        return $modal.open({
+        return $uibModal.open({
             templateUrl: './cat/catalog/t_request_items',
             animation: true,
             controller:
-                   ['$scope','$modalInstance',
-            function($scope , $modalInstance) {
+                   ['$scope','$uibModalInstance',
+            function($scope , $uibModalInstance) {
                 $scope.user = null;
                 $scope.first_user_fetch = true;
 
@@ -536,11 +536,11 @@ function($scope,  $q , $routeParams , $timeout , $window , $modal , bucketSvc ,
                         egCore.auth.token(), args, h.copy_list
                     );
 
-                    $modalInstance.close();
+                    $uibModalInstance.close();
                 }
 
                 $scope.cancel = function($event) {
-                    $modalInstance.dismiss();
+                    $uibModalInstance.dismiss();
                     $event.preventDefault();
                 }
             }]
index 9056b86..5c891d0 100644 (file)
@@ -242,9 +242,9 @@ angular.module('egCatRecordBuckets',
  * Hosts functions needed by all controllers.
  */
 .controller('RecordBucketCtrl',
-       ['$scope','$location','$q','$timeout','$modal',
+       ['$scope','$location','$q','$timeout','$uibModal',
         '$window','egCore','bucketSvc',
-function($scope,  $location,  $q,  $timeout,  $modal,  
+function($scope,  $location,  $q,  $timeout,  $uibModal,  
          $window,  egCore,  bucketSvc) {
 
     $scope.bucketSvc = bucketSvc;
@@ -295,13 +295,13 @@ function($scope,  $location,  $q,  $timeout,  $modal,
     }
 
     $scope.openCreateBucketDialog = function() {
-        $modal.open({
+        $uibModal.open({
             templateUrl: './cat/bucket/record/t_bucket_create',
             controller: 
-                ['$scope', '$modalInstance', function($scope, $modalInstance) {
+                ['$scope', '$uibModalInstance', function($scope, $uibModalInstance) {
                 $scope.focusMe = true;
-                $scope.ok = function(args) { $modalInstance.close(args) }
-                $scope.cancel = function () { $modalInstance.dismiss() }
+                $scope.ok = function(args) { $uibModalInstance.close(args) }
+                $scope.cancel = function () { $uibModalInstance.dismiss() }
             }]
         }).result.then(function (args) {
             if (!args || !args.name) return;
@@ -319,10 +319,10 @@ function($scope,  $location,  $q,  $timeout,  $modal,
     }
 
     $scope.openEditBucketDialog = function() {
-        $modal.open({
+        $uibModal.open({
             templateUrl: './cat/bucket/record/t_bucket_edit',
             controller: 
-                ['$scope', '$modalInstance', function($scope, $modalInstance) {
+                ['$scope', '$uibModalInstance', function($scope, $uibModalInstance) {
                 $scope.focusMe = true;
                 $scope.args = {
                     name : bucketSvc.currentBucket.name(),
@@ -335,9 +335,9 @@ function($scope,  $location,  $q,  $timeout,  $modal,
                     args.pub = args.pub ? 't' : 'f';
                     // close the dialog after edit has completed
                     bucketSvc.editBucket(args).then(
-                        function() { $modalInstance.close() });
+                        function() { $uibModalInstance.close() });
                 }
-                $scope.cancel = function () { $modalInstance.dismiss() }
+                $scope.cancel = function () { $uibModalInstance.dismiss() }
             }]
         })
     }
@@ -346,13 +346,13 @@ function($scope,  $location,  $q,  $timeout,  $modal,
     // opens the delete confirmation and deletes the current
     // bucket if the user confirms.
     $scope.openDeleteBucketDialog = function() {
-        $modal.open({
+        $uibModal.open({
             templateUrl: './cat/bucket/record/t_bucket_delete',
             controller : 
-                ['$scope', '$modalInstance', function($scope, $modalInstance) {
+                ['$scope', '$uibModalInstance', function($scope, $uibModalInstance) {
                 $scope.bucket = function() { return bucketSvc.currentBucket }
-                $scope.ok = function() { $modalInstance.close() }
-                $scope.cancel = function() { $modalInstance.dismiss() }
+                $scope.ok = function() { $uibModalInstance.close() }
+                $scope.cancel = function() { $uibModalInstance.dismiss() }
             }]
         }).result.then(function () {
             bucketSvc.deleteBucket(bucketSvc.currentBucket.id())
@@ -365,17 +365,17 @@ function($scope,  $location,  $q,  $timeout,  $modal,
 
     // retrieves the requested bucket by ID
     $scope.openSharedBucketDialog = function() {
-        $modal.open({
+        $uibModal.open({
             templateUrl: './cat/bucket/record/t_load_shared',
             controller : 
-                ['$scope', '$modalInstance', function($scope, $modalInstance) {
+                ['$scope', '$uibModalInstance', function($scope, $uibModalInstance) {
                 $scope.focusMe = true;
                 $scope.ok = function(args) { 
                     if (args && args.id) {
-                        $modalInstance.close(args.id) 
+                        $uibModalInstance.close(args.id) 
                     }
                 }
-                $scope.cancel = function() { $modalInstance.dismiss() }
+                $scope.cancel = function() { $uibModalInstance.dismiss() }
             }]
         }).result.then(function(id) {
             // RecordBucketCtrl $scope is not inherited by the
@@ -387,13 +387,13 @@ function($scope,  $location,  $q,  $timeout,  $modal,
 
     // opens the record export dialog
     $scope.openExportBucketDialog = function() {
-        $modal.open({
+        $uibModal.open({
             templateUrl: './cat/bucket/record/t_bucket_export',
             controller : 
-                ['$scope', '$modalInstance', function($scope, $modalInstance) {
+                ['$scope', '$uibModalInstance', function($scope, $uibModalInstance) {
                 $scope.args = {format : 'XML', encoding : 'UTF-8'}; // defaults
-                $scope.ok = function(args) { $modalInstance.close(args) }
-                $scope.cancel = function() { $modalInstance.dismiss() }
+                $scope.ok = function(args) { $uibModalInstance.close(args) }
+                $scope.cancel = function() { $uibModalInstance.dismiss() }
             }]
         }).result.then(function (args) {
             if (!args) return;
@@ -504,9 +504,9 @@ function($scope,  $routeParams,  bucketSvc , egGridDataProvider) {
 
 .controller('ViewCtrl',
        ['$scope','$q','$routeParams','bucketSvc','egCore','$window',
-        '$timeout','egConfirmDialog','$modal','egHolds',
+        '$timeout','egConfirmDialog','$uibModal','egHolds',
 function($scope,  $q , $routeParams,  bucketSvc,  egCore,  $window,
-         $timeout,  egConfirmDialog,  $modal,  egHolds) {
+         $timeout,  egConfirmDialog,  $uibModal,  egHolds) {
 
     $scope.setTab('view');
     $scope.bucketId = $routeParams.id;
@@ -542,12 +542,12 @@ function($scope,  $q , $routeParams,  bucketSvc,  egCore,  $window,
 
     // opens the record merge dialog
     $scope.openRecordMergeDialog = function(records) {
-        $modal.open({
+        $uibModal.open({
             templateUrl: './cat/bucket/record/t_merge_records',
             size: 'lg',
             windowClass: 'eg-wide-modal',
             controller:
-                ['$scope', '$modalInstance', function($scope, $modalInstance) {
+                ['$scope', '$uibModalInstance', function($scope, $uibModalInstance) {
                 $scope.records = [];
                 $scope.lead_id = 0;
                 $scope.editing_inplace = false;
@@ -555,12 +555,12 @@ function($scope,  $q , $routeParams,  bucketSvc,  egCore,  $window,
                     $scope.records.push({ id : rec.id });
                 });
                 $scope.ok = function() {
-                    $modalInstance.close({
+                    $uibModalInstance.close({
                         lead_id : $scope.lead_id,
                         records : $scope.records
                     });
                 }
-                $scope.cancel = function () { $modalInstance.dismiss() }
+                $scope.cancel = function () { $uibModalInstance.dismiss() }
                 $scope.use_as_lead = function(rec) {
                     if ($scope.lead_id) {
                         $scope.records.push({ id : $scope.lead_id });
@@ -583,16 +583,16 @@ function($scope,  $q , $routeParams,  bucketSvc,  egCore,  $window,
                 }
                 $scope.edit_lead = function() {
                     var lead_id = $scope.lead_id;
-                    $modal.open({
+                    $uibModal.open({
                         templateUrl: './cat/bucket/record/t_edit_lead_record',
                         size: 'lg',
                         controller:
-                            ['$scope', '$modalInstance', function($scope, $modalInstance) {
+                            ['$scope', '$uibModalInstance', function($scope, $uibModalInstance) {
                             $scope.focusMe = true;
                             $scope.record_id = lead_id;
                             $scope.dirty_flag = false;
-                            $scope.ok = function() { $modalInstance.close() }
-                            $scope.cancel = function () { $modalInstance.dismiss() }
+                            $scope.ok = function() { $uibModalInstance.close() }
+                            $scope.cancel = function () { $uibModalInstance.dismiss() }
                         }]
                     }).result.then(function() {
                         // TODO: need a way to force a refresh of the egRecordBreaker, as
@@ -670,13 +670,13 @@ function($scope,  $q , $routeParams,  bucketSvc,  egCore,  $window,
                     }
                 });
                 if (failures.length) {
-                    $modal.open({
+                    $uibModal.open({
                         templateUrl: './cat/bucket/record/t_records_not_deleted',
                         controller :
-                            ['$scope', '$modalInstance', function($scope, $modalInstance) {
+                            ['$scope', '$uibModalInstance', function($scope, $uibModalInstance) {
                             $scope.failures = failures;
-                            $scope.ok = function() { $modalInstance.close() }
-                            $scope.cancel = function() { $modalInstance.dismiss() }
+                            $scope.ok = function() { $uibModalInstance.close() }
+                            $scope.cancel = function() { $uibModalInstance.dismiss() }
                             }]
                     });
                 }
index a635b9c..729469b 100644 (file)
@@ -238,9 +238,9 @@ function($scope , $routeParams , $location , $window , $q , egCore) {
 
 .controller('CatalogCtrl',
        ['$scope','$routeParams','$location','$window','$q','egCore','egHolds','egCirc','egConfirmDialog','ngToast',
-        'egGridDataProvider','egHoldGridActions','$timeout','$modal','holdingsSvc','egUser','conjoinedSvc',
+        'egGridDataProvider','egHoldGridActions','$timeout','$uibModal','holdingsSvc','egUser','conjoinedSvc',
 function($scope , $routeParams , $location , $window , $q , egCore , egHolds , egCirc , egConfirmDialog , ngToast ,
-         egGridDataProvider , egHoldGridActions , $timeout , $modal , holdingsSvc , egUser , conjoinedSvc) {
+         egGridDataProvider , egHoldGridActions , $timeout , $uibModal , holdingsSvc , egUser , conjoinedSvc) {
 
     var holdingsSvcInst = new holdingsSvc();
 
@@ -288,13 +288,13 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
 
     $scope.add_to_record_bucket = function() {
         var recId = $scope.record_id;
-        return $modal.open({
+        return $uibModal.open({
             templateUrl: './cat/catalog/t_add_to_bucket',
             animation: true,
             size: 'md',
             controller:
-                   ['$scope','$modalInstance',
-            function($scope , $modalInstance) {
+                   ['$scope','$uibModalInstance',
+            function($scope , $uibModalInstance) {
 
                 $scope.bucket_id = 0;
                 $scope.newBucketName = '';
@@ -315,7 +315,7 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
                         'open-ils.actor.container.item.create',
                         egCore.auth.token(), 'biblio', item
                     ).then(function(resp) {
-                        $modalInstance.close();
+                        $uibModalInstance.close();
                     });
                 }
 
@@ -337,7 +337,7 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
                 }
 
                 $scope.cancel = function() {
-                    $modalInstance.dismiss();
+                    $uibModalInstance.dismiss();
                 }
             }]
         });
@@ -467,12 +467,12 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
 
         var conjoinedGridDataProviderRef = $scope.conjoinedGridDataProvider;
 
-        return $modal.open({
+        return $uibModal.open({
             templateUrl: './cat/catalog/t_conjoined_selector',
             animation: true,
             controller:
-                   ['$scope','$modalInstance',
-            function($scope , $modalInstance) {
+                   ['$scope','$uibModalInstance',
+            function($scope , $uibModalInstance) {
                 $scope.update = true;
 
                 $scope.peer_type = null;
@@ -491,13 +491,13 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
                     });
     
                     return $q.all(promises)
-                        .then(function(){$modalInstance.close()})
+                        .then(function(){$uibModalInstance.close()})
                         .then(function(){return conjoinedSvc.fetch()})
                         .then(function(){conjoinedGridDataProviderRef.refresh()});
                 }
     
                 $scope.cancel = function($event) {
-                    $modalInstance.dismiss();
+                    $uibModalInstance.dismiss();
                     $event.preventDefault();
                 }
             }]
@@ -552,13 +552,13 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
         var copy_list = gatherSelectedHoldingsIds();
         if (copy_list.length == 0) return;
 
-        return $modal.open({
+        return $uibModal.open({
             templateUrl: './cat/catalog/t_add_to_bucket',
             animation: true,
             size: 'md',
             controller:
-                   ['$scope','$modalInstance',
-            function($scope , $modalInstance) {
+                   ['$scope','$uibModalInstance',
+            function($scope , $uibModalInstance) {
 
                 $scope.bucket_id = 0;
                 $scope.newBucketName = '';
@@ -586,7 +586,7 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
                         );
 
                         return $q.all(promises).then(function() {
-                            $modalInstance.close();
+                            $uibModalInstance.close();
                         });
                     });
                 }
@@ -609,7 +609,7 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
                 }
 
                 $scope.cancel = function() {
-                    $modalInstance.dismiss();
+                    $uibModalInstance.dismiss();
                 }
             }]
         });
@@ -619,12 +619,12 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
         var copy_list = gatherSelectedHoldingsIds();
         if (copy_list.length == 0) return;
 
-        return $modal.open({
+        return $uibModal.open({
             templateUrl: './cat/catalog/t_request_items',
             animation: true,
             controller:
-                   ['$scope','$modalInstance',
-            function($scope , $modalInstance) {
+                   ['$scope','$uibModalInstance',
+            function($scope , $uibModalInstance) {
                 $scope.user = null;
                 $scope.first_user_fetch = true;
 
@@ -673,11 +673,11 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
                         egCore.auth.token(), args, h.copy_list
                     );
 
-                    $modalInstance.close();
+                    $uibModalInstance.close();
                 }
 
                 $scope.cancel = function($event) {
-                    $modalInstance.dismiss();
+                    $uibModalInstance.dismiss();
                     $event.preventDefault();
                 }
             }]
@@ -691,12 +691,12 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
         var holdingsGridDataProviderRef = $scope.holdingsGridDataProvider;
 
         angular.forEach(copy_list, function (cp) {
-            $modal.open({
+            $uibModal.open({
                 templateUrl: './cat/share/t_replace_barcode',
                 animation: true,
                 controller:
-                           ['$scope','$modalInstance',
-                    function($scope , $modalInstance) {
+                           ['$scope','$uibModalInstance',
+                    function($scope , $uibModalInstance) {
                         $scope.isModal = true;
                         $scope.focusBarcode = false;
                         $scope.focusBarcode2 = true;
@@ -728,11 +728,11 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
                                 });
 
                             });
-                            $modalInstance.close();
+                            $uibModalInstance.close();
                         }
 
                         $scope.cancel = function($event) {
-                            $modalInstance.dismiss();
+                            $uibModalInstance.dismiss();
                             $event.preventDefault();
                         }
                     }
@@ -1008,12 +1008,12 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
     }
 
     $scope.markLibAsVolTarget = function() {
-        return $modal.open({
+        return $uibModal.open({
             templateUrl: './cat/catalog/t_choose_vol_target_lib',
             animation: true,
             controller:
-                   ['$scope','$modalInstance',
-            function($scope , $modalInstance) {
+                   ['$scope','$uibModalInstance',
+            function($scope , $uibModalInstance) {
 
                 var orgId = egCore.hatch.getLocalItem('eg.cat.volume_transfer_target') || 1;
                 $scope.org = egCore.org.get(orgId);
@@ -1023,10 +1023,10 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
                         'eg.cat.volume_transfer_target',
                         org.id()
                     );
-                    $modalInstance.close();
+                    $uibModalInstance.close();
                 }
                 $scope.cancel = function($event) {
-                    $modalInstance.dismiss();
+                    $uibModalInstance.dismiss();
                     $event.preventDefault();
                 }
             }]
@@ -1270,12 +1270,12 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
         egCore.hatch.getItem('eg.cat.marked_conjoined_record').then(function(target_record) {
             if (!target_record) return;
 
-            return $modal.open({
+            return $uibModal.open({
                 templateUrl: './cat/catalog/t_conjoined_selector',
                 animation: true,
                 controller:
-                       ['$scope','$modalInstance',
-                function($scope , $modalInstance) {
+                       ['$scope','$uibModalInstance',
+                function($scope , $uibModalInstance) {
                     $scope.update = false;
 
                     $scope.peer_type = null;
@@ -1296,11 +1296,11 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e
                             promises.push(egCore.pcrud.create(n));
                         });
     
-                        return $q.all(promises).then(function(){$modalInstance.close()});
+                        return $q.all(promises).then(function(){$uibModalInstance.close()});
                     }
     
                     $scope.cancel = function($event) {
-                        $modalInstance.dismiss();
+                        $uibModalInstance.dismiss();
                         $event.preventDefault();
                     }
                 }]
index f33fa65..2742915 100644 (file)
@@ -292,8 +292,8 @@ function(egCore , $q) {
         },
         templateUrl: './cat/share/t_volume_list',
         controller:
-                   ['$scope','holdingsSvc','egCore','egGridDataProvider','$modal',
-            function($scope , holdingsSvc , egCore , egGridDataProvider,  $modal) {
+                   ['$scope','holdingsSvc','egCore','egGridDataProvider','$uibModal',
+            function($scope , holdingsSvc , egCore , egGridDataProvider,  $uibModal) {
                 var holdingsSvcInst = new holdingsSvc();
 
                 $scope.holdingsGridControls = {};
@@ -324,16 +324,16 @@ function(egCore , $q) {
                         }
                     ).then(function(key) {
                         if (key) {
-                            $modal.open({
+                            $uibModal.open({
                                 templateUrl: './cat/share/t_embedded_volcopy',
                                 size: 'lg',
                                 windowClass: 'eg-wide-modal',
                                 controller:
-                                    ['$scope', '$modalInstance', function($scope, $modalInstance) {
+                                    ['$scope', '$uibModalInstance', function($scope, $uibModalInstance) {
                                     $scope.volcopy_url = 
                                         egCore.env.basePath + 'cat/volcopy/' + key + '/embedded';
-                                    $scope.ok = function(args) { $modalInstance.close(args) }
-                                    $scope.cancel = function () { $modalInstance.dismiss() }
+                                    $scope.ok = function(args) { $uibModalInstance.close(args) }
+                                    $scope.cancel = function () { $uibModalInstance.dismiss() }
                                 }]
                             }).result.then(function() {
                                 load_holdings();
index c4862f9..1e9460b 100644 (file)
@@ -475,8 +475,8 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap'])
                   '</div>',
         scope: { field: "=", onKeydown: '=', contextFunctions: '=' },
         replace: true,
-        controller : ['$scope','$modal',
-            function ( $scope,  $modal ) {
+        controller : ['$scope','$uibModal',
+            function ( $scope,  $uibModal ) {
                 $scope.stackSubfields = $scope.$parent.$parent.stackSubfields;
                 $scope.isAuthorityControlled = function () {
                     return ($scope.$parent.$parent.record_type == 'bre') &&
@@ -495,16 +495,16 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap'])
                     });
                     var cs = $scope.$parent.$parent.controlSet;
                     var args = { changed : false };
-                    $modal.open({
+                    $uibModal.open({
                         templateUrl: './cat/share/t_authority_link_dialog',
                         size: 'lg',
-                        controller: ['$scope', '$modalInstance', function($scope, $modalInstance) {
+                        controller: ['$scope', '$uibModalInstance', function($scope, $uibModalInstance) {
                             $scope.controlSet = cs;
                             $scope.bibField = fieldCopy;
                             $scope.focusMe = true;
                             $scope.args = args;
-                            $scope.ok = function(args) { $modalInstance.close(args) };
-                            $scope.cancel = function () { $modalInstance.dismiss() };
+                            $scope.ok = function(args) { $uibModalInstance.close(args) };
+                            $scope.cancel = function () { $uibModalInstance.dismiss() };
                         }]
                     }).result.then(function (args) {
                         if (args.changed) {
@@ -544,8 +544,8 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap'])
                       '</button>'+
                   '</div>',
         scope: { field: "=", onKeydown: '=', contextFunctions: '=' },
-        controller : ['$scope','$modal',
-            function ( $scope,  $modal) {
+        controller : ['$scope','$uibModal',
+            function ( $scope,  $uibModal) {
                 $scope.showPhysCharLink = function () {
                     return ($scope.$parent.$parent.record_type == 'bre') 
                         && $scope.field.tag == '007';
@@ -556,15 +556,15 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap'])
                         field : $scope.field,
                         orig_value : $scope.field.data
                     };
-                    $modal.open({
+                    $uibModal.open({
                         templateUrl: './cat/share/t_physchar_dialog',
-                        controller: ['$scope','$modalInstance',
-                            function( $scope , $modalInstance) {
+                        controller: ['$scope','$uibModalInstance',
+                            function( $scope , $uibModalInstance) {
                             $scope.focusMe = true;
                             $scope.args = args;
-                            $scope.ok = function(args) { $modalInstance.close(args) };
+                            $scope.ok = function(args) { $uibModalInstance.close(args) };
                             $scope.cancel = function () { 
-                                $modalInstance.dismiss();
+                                $uibModalInstance.dismiss();
                                 args.field.data = args.orig_value;
                             };
                         }],
@@ -1455,8 +1455,8 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap'])
             controlSet : '=',
             changed : '='
         },
-        controller: ['$scope','$modal','egCore','egAuth',
-            function ($scope , $modal,  egCore,  egAuth) {
+        controller: ['$scope','$uibModal','egCore','egAuth',
+            function ($scope , $uibModal,  egCore,  egAuth) {
 
                 $scope.searchStr = '';
                 var cni = egCore.env.aous['cat.marc_control_number_identifier'] ||
@@ -1611,17 +1611,17 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap'])
                         egAuth.token()
                     ).then(function(newAuthority) {
                         if (spawn_editor) {
-                            $modal.open({
+                            $uibModal.open({
                                 templateUrl: './cat/share/t_edit_new_authority',
                                 size: 'lg',
                                 controller:
-                                    ['$scope', '$modalInstance', function($scope, $modalInstance) {
+                                    ['$scope', '$uibModalInstance', function($scope, $uibModalInstance) {
                                     $scope.focusMe = true;
                                     $scope.args = args;
                                     $scope.dirty_flag = false;
                                     $scope.marc_xml = newAuthority,
-                                    $scope.ok = function(args) { $modalInstance.close(args) }
-                                    $scope.cancel = function () { $modalInstance.dismiss() }
+                                    $scope.ok = function(args) { $uibModalInstance.close(args) }
+                                    $scope.cancel = function () { $uibModalInstance.dismiss() }
                                 }]
                             }).result.then(function (args) {
                                 if (!args || !args.authority_id) return;
index 40efacc..8c9ce68 100644 (file)
@@ -751,8 +751,8 @@ function(egCore , $q) {
  * Edit controller!
  */
 .controller('EditCtrl', 
-       ['$scope','$q','$window','$routeParams','$location','$timeout','egCore','egNet','egGridDataProvider','itemSvc','$modal',
-function($scope , $q , $window , $routeParams , $location , $timeout , egCore , egNet , egGridDataProvider , itemSvc , $modal) {
+       ['$scope','$q','$window','$routeParams','$location','$timeout','egCore','egNet','egGridDataProvider','itemSvc','$uibModal',
+function($scope , $q , $window , $routeParams , $location , $timeout , egCore , egNet , egGridDataProvider , itemSvc , $uibModal) {
 
     $scope.defaults = { // If defaults are not set at all, allow everything
         barcode_checkdigit : false,
@@ -1535,12 +1535,12 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
         var default_pub = Boolean($scope.defaults.copy_notes_pub);
         if (!angular.isArray(copy_list)) copy_list = [copy_list];
 
-        return $modal.open({
+        return $uibModal.open({
             templateUrl: './cat/volcopy/t_copy_notes',
             animation: true,
             controller:
-                   ['$scope','$modalInstance',
-            function($scope , $modalInstance) {
+                   ['$scope','$uibModalInstance',
+            function($scope , $uibModalInstance) {
                 $scope.focusNote = true;
                 $scope.note = {
                     creator : egCore.auth.user().id(),
@@ -1576,11 +1576,11 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
                         cp.notes().push( n );
                     });
 
-                    $modalInstance.close();
+                    $uibModalInstance.close();
                 }
 
                 $scope.cancel = function($event) {
-                    $modalInstance.dismiss();
+                    $uibModalInstance.dismiss();
                     $event.preventDefault();
                 }
             }]
index 85c0ac0..c8f36e9 100644 (file)
@@ -26,9 +26,9 @@ angular.module('egCatZ3950Search',
  * List view - grid stuff
  */
 .controller('Z3950SearchCtrl',
-       ['$scope','$q','$location','$timeout','$window','egCore','egGridDataProvider','egZ3950TargetSvc','$modal',
+       ['$scope','$q','$location','$timeout','$window','egCore','egGridDataProvider','egZ3950TargetSvc','$uibModal',
         'egConfirmDialog',
-function($scope , $q , $location , $timeout , $window,  egCore , egGridDataProvider,  egZ3950TargetSvc,  $modal,
+function($scope , $q , $location , $timeout , $window,  egCore , egGridDataProvider,  egZ3950TargetSvc,  $uibModal,
          egConfirmDialog) {
 
     // get list of targets
@@ -149,15 +149,15 @@ function($scope , $q , $location , $timeout , $window,  egCore , egGridDataProvi
         return egZ3950TargetSvc.rawSearchImpossible();
     }
     $scope.showRawSearchForm = function() {
-        $modal.open({
+        $uibModal.open({
             templateUrl: './cat/z3950/t_raw_search',
             size: 'md',
             controller:
-                ['$scope', '$modalInstance', function($scope, $modalInstance) {
+                ['$scope', '$uibModalInstance', function($scope, $uibModalInstance) {
                 egZ3950TargetSvc.setRawSearch('');
                 $scope.focusMe = true;
-                $scope.ok = function(args) { $modalInstance.close(args) }
-                $scope.cancel = function () { $modalInstance.dismiss() }
+                $scope.ok = function(args) { $uibModalInstance.close(args) }
+                $scope.cancel = function () { $uibModalInstance.dismiss() }
             }]
         }).result.then(function (args) {
             if (!args || !args.raw_search) return;
@@ -252,17 +252,17 @@ function($scope , $q , $location , $timeout , $window,  egCore , egGridDataProvi
     $scope.spawn_editor = function() {
         var items = $scope.gridControls.selectedItems();
         var recId = 0;
-        $modal.open({
+        $uibModal.open({
             templateUrl: './cat/z3950/t_marc_edit',
             size: 'lg',
             controller:
-                ['$scope', '$modalInstance', function($scope, $modalInstance) {
+                ['$scope', '$uibModalInstance', function($scope, $uibModalInstance) {
                 $scope.focusMe = true;
                 $scope.record_id = recId;
                 $scope.dirty_flag = false;
                 $scope.marc_xml = items[0]['marcxml'];
-                $scope.ok = function(args) { $modalInstance.close(args) }
-                $scope.cancel = function () { $modalInstance.dismiss() }
+                $scope.ok = function(args) { $uibModalInstance.close(args) }
+                $scope.cancel = function () { $uibModalInstance.dismiss() }
                 $scope.save_label = egCore.strings.IMPORT_BUTTON_LABEL;
                 $scope.import_record_callback = function (record_id) {
                     recId = record_id;
@@ -278,16 +278,16 @@ function($scope , $q , $location , $timeout , $window,  egCore , egGridDataProvi
 
     $scope.view_marc = function() {
         var items = $scope.gridControls.selectedItems();
-        $modal.open({
+        $uibModal.open({
             templateUrl: './cat/z3950/t_marc_html',
             size: 'lg',
             controller:
-                ['$scope', '$modalInstance', function($scope, $modalInstance) {
+                ['$scope', '$uibModalInstance', function($scope, $uibModalInstance) {
                 $scope.focusMe = true;
                 $scope.marc_xml = items[0]['marcxml'];
                 $scope.isbn = (items[0].isbn() || '').replace(/ .*/, '');
-                $scope.ok = function(args) { $modalInstance.close(args) }
-                $scope.cancel = function () { $modalInstance.dismiss() }
+                $scope.ok = function(args) { $uibModalInstance.close(args) }
+                $scope.cancel = function () { $uibModalInstance.dismiss() }
             }]
         }).result.then(function (args) {
             if (!args || !args.name) return;
@@ -300,28 +300,28 @@ function($scope , $q , $location , $timeout , $window,  egCore , egGridDataProvi
         var args = {
             'marc_xml' : items[0]['marcxml']
         };
-        $modal.open({
+        $uibModal.open({
             templateUrl: './cat/z3950/t_overlay',
             size: 'lg',
             controller:
-                ['$scope', '$modalInstance', function($scope, $modalInstance) {
+                ['$scope', '$uibModalInstance', function($scope, $uibModalInstance) {
                 $scope.focusMe = true;
                 $scope.overlay_target = overlay_target;
                 $scope.args = args;
-                $scope.ok = function(args) { $modalInstance.close(args) };
-                $scope.cancel = function () { $modalInstance.dismiss() };
+                $scope.ok = function(args) { $uibModalInstance.close(args) };
+                $scope.cancel = function () { $uibModalInstance.dismiss() };
                 $scope.editOverlayRecord = function() {
-                    $modal.open({
+                    $uibModal.open({
                         templateUrl: './cat/z3950/t_edit_overlay_record',
                         size: 'lg',
                         controller:
-                            ['$scope', '$modalInstance', function($scope, $modalInstance) {
+                            ['$scope', '$uibModalInstance', function($scope, $uibModalInstance) {
                             $scope.focusMe = true;
                             $scope.record_id = 0;
                             $scope.dirty_flag = false;
                             $scope.args = args;
-                            $scope.ok = function(args) { $modalInstance.close(args) }
-                            $scope.cancel = function () { $modalInstance.dismiss() }
+                            $scope.ok = function(args) { $uibModalInstance.close(args) }
+                            $scope.cancel = function () { $uibModalInstance.dismiss() }
                         }]
                     }).result.then(function (args) {
                         if (!args || !args.name) return;
index 9cf3b45..652a35f 100644 (file)
@@ -1062,8 +1062,8 @@ function($scope,  $q,  $routeParams,  $timeout,  $window,  $location,  egCore,
  * Manages messages
  */
 .controller('PatronMessagesCtrl',
-       ['$scope','$q','$routeParams','egCore','$modal','patronSvc','egCirc',
-function($scope , $q , $routeParams,  egCore , $modal , patronSvc , egCirc) {
+       ['$scope','$q','$routeParams','egCore','$uibModal','patronSvc','egCirc',
+function($scope , $q , $routeParams,  egCore , $uibModal , patronSvc , egCirc) {
     $scope.initTab('messages', $routeParams.id);
     var usr_id = $routeParams.id;
 
@@ -1288,8 +1288,8 @@ function($scope,  $routeParams , $location , egCore , patronSvc) {
 }])
 
 .controller('PatronNotesCtrl',
-       ['$scope','$routeParams','$location','egCore','patronSvc','$modal',
-function($scope,  $routeParams , $location , egCore , patronSvc , $modal) {
+       ['$scope','$routeParams','$location','egCore','patronSvc','$uibModal',
+function($scope,  $routeParams , $location , egCore , patronSvc , $uibModal) {
     $scope.initTab('other', $routeParams.id);
     var usr_id = $routeParams.id;
 
@@ -1307,15 +1307,15 @@ function($scope,  $routeParams , $location , egCore , patronSvc , $modal) {
 
     // open the new-note dialog and create the note
     $scope.newNote = function() {
-        $modal.open({
+        $uibModal.open({
             templateUrl: './circ/patron/t_new_note_dialog',
             controller: 
-                ['$scope', '$modalInstance',
-            function($scope, $modalInstance) {
+                ['$scope', '$uibModalInstance',
+            function($scope, $uibModalInstance) {
                 $scope.focusNote = true;
                 $scope.args = {};
-                $scope.ok = function(count) { $modalInstance.close($scope.args) }
-                $scope.cancel = function () { $modalInstance.dismiss() }
+                $scope.ok = function(count) { $uibModalInstance.close($scope.args) }
+                $scope.cancel = function () { $uibModalInstance.dismiss() }
             }],
         }).result.then(
             function(args) {
@@ -1353,9 +1353,9 @@ function($scope,  $routeParams , $location , egCore , patronSvc , $modal) {
 
 .controller('PatronGroupCtrl',
        ['$scope','$routeParams','$q','$window','$timeout','$location','egCore',
-        'patronSvc','$modal','egPromptDialog','egConfirmDialog',
+        'patronSvc','$uibModal','egPromptDialog','egConfirmDialog',
 function($scope,  $routeParams , $q , $window , $timeout,  $location , egCore ,
-         patronSvc , $modal , egPromptDialog , egConfirmDialog) {
+         patronSvc , $uibModal , egPromptDialog , egConfirmDialog) {
 
     var usr_id = $routeParams.id;
 
@@ -1463,18 +1463,18 @@ function($scope,  $routeParams , $q , $window , $timeout,  $location , egCore ,
             egCore.pcrud.retrieve('au', card.usr())
             .then(function(user) {
                 user.card(card);
-                $modal.open({
+                $uibModal.open({
                     templateUrl: './circ/patron/t_move_to_group_dialog',
                     controller: [
-                                '$scope','$modalInstance',
-                        function($scope , $modalInstance) {
+                                '$scope','$uibModalInstance',
+                        function($scope , $uibModalInstance) {
                             $scope.user = user;
                             $scope.selected = selected;
                             $scope.outbound = outbound;
                             $scope.ok = 
-                                function(count) { $modalInstance.close() }
+                                function(count) { $uibModalInstance.close() }
                             $scope.cancel = 
-                                function () { $modalInstance.dismiss() }
+                                function () { $uibModalInstance.dismiss() }
                         }
                     ]
                 }).result.then(function() {
index 80be1fe..0c366d8 100644 (file)
@@ -112,11 +112,9 @@ function($q , egCore , patronSvc) {
  */
 .controller('PatronBillsCtrl',
        ['$scope','$q','$routeParams','egCore','egConfirmDialog','$location',
-        'egGridDataProvider','billSvc','patronSvc','egPromptDialog','$modal',
-        'egBilling',
+        'egGridDataProvider','billSvc','patronSvc','egPromptDialog', 'egBilling',
 function($scope , $q , $routeParams , egCore , egConfirmDialog , $location,
-         egGridDataProvider , billSvc , patronSvc , egPromptDialog , $modal,
-         egBilling) {
+         egGridDataProvider , billSvc , patronSvc , egPromptDialog, egBilling) {
 
     $scope.initTab('bills', $routeParams.id);
     billSvc.userId = $routeParams.id;
index 9806d8f..3d6e9c6 100644 (file)
@@ -4,10 +4,10 @@
 
 angular.module('egPatronApp').controller('PatronCheckoutCtrl',
 
-       ['$scope','$q','$modal','$routeParams','egCore','egUser','patronSvc',
+       ['$scope','$q','$routeParams','egCore','egUser','patronSvc',
         'egGridDataProvider','$location','$timeout','egCirc',
 
-function($scope , $q , $modal , $routeParams , egCore , egUser , patronSvc , 
+function($scope , $q , $routeParams , egCore , egUser , patronSvc , 
          egGridDataProvider , $location , $timeout , egCirc) {
 
     $scope.initTab('checkout', $routeParams.id).finally(function(){
index 380c42c..5113591 100644 (file)
@@ -6,9 +6,9 @@ angular.module('egPatronApp')
 
 .controller('PatronItemsOutCtrl',
        ['$scope','$q','$routeParams','$timeout','egCore','egUser','patronSvc','$location',
-        'egGridDataProvider','$modal','egCirc','egConfirmDialog','egBilling','$window',
+        'egGridDataProvider','$uibModal','egCirc','egConfirmDialog','egBilling','$window',
 function($scope,  $q,  $routeParams,  $timeout,  egCore , egUser,  patronSvc , $location, 
-         egGridDataProvider , $modal , egCirc , egConfirmDialog , egBilling , $window) {
+         egGridDataProvider , $uibModal , egCirc , egConfirmDialog , egBilling , $window) {
 
     // list of noncatatloged circulations. Define before initTab to 
     // avoid any possibility of race condition, since they are loaded
@@ -254,11 +254,11 @@ function($scope,  $q,  $routeParams,  $timeout,  egCore , egUser,  patronSvc , $
     $scope.edit_due_date = function(items) {
         if (!items.length) return;
 
-        $modal.open({
+        $uibModal.open({
             templateUrl : './circ/patron/t_edit_due_date_dialog',
             controller : [
-                        '$scope','$modalInstance',
-                function($scope , $modalInstance) {
+                        '$scope','$uibModalInstance',
+                function($scope , $uibModalInstance) {
 
                     // if there is only one circ, default to the due date
                     // of that circ.  Otherwise, default to today.
@@ -299,12 +299,12 @@ function($scope,  $q,  $routeParams,  $timeout,  egCore , egUser,  patronSvc , $
                         });
 
                         $q.all(promises).then(function() {
-                            $modalInstance.close();
+                            $uibModalInstance.close();
                             provider.refresh();
                         });
                     }
                     $scope.cancel = function($event) {
-                        $modalInstance.dismiss();
+                        $uibModalInstance.dismiss();
                         $event.preventDefault();
                     }
                 }
@@ -406,17 +406,17 @@ function($scope,  $q,  $routeParams,  $timeout,  egCore , egUser,  patronSvc , $
         var barcodes = items.map(function(circ) 
             { return circ.target_copy().barcode() });
 
-        return $modal.open({
+        return $uibModal.open({
             templateUrl : './circ/patron/t_edit_due_date_dialog',
             templateUrl : './circ/patron/t_renew_with_date_dialog',
             controller : [
-                        '$scope','$modalInstance',
-                function($scope , $modalInstance) {
+                        '$scope','$uibModalInstance',
+                function($scope , $uibModalInstance) {
                     $scope.args = {
                         barcodes : barcodes,
                         date : new Date()
                     }
-                    $scope.cancel = function() {$modalInstance.dismiss()}
+                    $scope.cancel = function() {$uibModalInstance.dismiss()}
 
                     // Fire off the due-date updater for each circ.
                     // When all is done, close the dialog
@@ -429,7 +429,7 @@ function($scope,  $q,  $routeParams,  $timeout,  egCore , egUser,  patronSvc , $
                                 egCirc.renew({copy_barcode : bc, due_date : due})
                                 .finally(do_one);
                             } else {
-                                $modalInstance.close(); 
+                                $uibModalInstance.close(); 
                                 reset_page();
                             }
                         }
index 69577d3..2d484be 100644 (file)
@@ -1079,8 +1079,8 @@ angular.module('egCoreMod')
 }]);
 
 
-function PatronRegCtrl($scope, $routeParams, $q, $modal, $window, egCore
-    patronSvc, patronRegSvc, egUnloadPrompt, egAlertDialog) {
+function PatronRegCtrl($scope, $routeParams, $q, $uibModal, $window
+    egCore, patronSvc, patronRegSvc, egUnloadPrompt, egAlertDialog) {
 
     $scope.page_data_loaded = false;
     $scope.clone_id = patronRegSvc.clone_id = $routeParams.clone_id;
@@ -1426,16 +1426,16 @@ function PatronRegCtrl($scope, $routeParams, $q, $modal, $window, egCore,
     }
 
     $scope.cards_dialog = function() {
-        $modal.open({
+        $uibModal.open({
             templateUrl: './circ/patron/t_patron_cards_dialog',
             controller: 
-                   ['$scope','$modalInstance','cards', 'perms',
-            function($scope , $modalInstance , cards, perms) {
+                   ['$scope','$uibModalInstance','cards','perms',
+            function($scope , $uibModalInstance , cards , perms) {
                 // scope here is the modal-level scope
                 $scope.args = {cards : cards};
                 $scope.perms = perms;
-                $scope.ok = function() { $modalInstance.close($scope.args) }
-                $scope.cancel = function () { $modalInstance.dismiss() }
+                $scope.ok = function() { $uibModalInstance.close($scope.args) }
+                $scope.cancel = function () { $uibModalInstance.dismiss() }
             }],
             resolve : {
                 cards : function() {
@@ -1502,11 +1502,11 @@ function PatronRegCtrl($scope, $routeParams, $q, $modal, $window, egCore,
 
     // dialog for selecting additional permission groups
     $scope.secondary_groups_dialog = function() {
-        $modal.open({
+        $uibModal.open({
             templateUrl: './circ/patron/t_patron_groups_dialog',
             controller: 
-                   ['$scope','$modalInstance','linked_groups','pgt_depth',
-            function($scope , $modalInstance , linked_groups , pgt_depth) {
+                   ['$scope','$uibModalInstance','linked_groups','pgt_depth',
+            function($scope , $uibModalInstance , linked_groups , pgt_depth) {
 
                 $scope.pgt_depth = pgt_depth;
                 $scope.args = {
@@ -1533,8 +1533,8 @@ function PatronRegCtrl($scope, $routeParams, $q, $modal, $window, egCore,
                     $event.preventDefault(); // avoid close
                 }
 
-                $scope.ok = function() { $modalInstance.close($scope.args) }
-                $scope.cancel = function () { $modalInstance.dismiss() }
+                $scope.ok = function() { $uibModalInstance.close($scope.args) }
+                $scope.cancel = function () { $uibModalInstance.dismiss() }
             }],
             resolve : {
                 linked_groups : function() { return $scope.patron.groups },
@@ -1814,8 +1814,6 @@ function PatronRegCtrl($scope, $routeParams, $q, $modal, $window, egCore,
     }
 }
 
-// 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', '$modal', 
+PatronRegCtrl.$inject = ['$scope', '$routeParams', '$q', '$uibModal', 
     '$window', 'egCore', 'patronSvc', 'patronRegSvc', 'egUnloadPrompt', 'egAlertDialog'];
 
index 9a2efb6..b01f9bf 100644 (file)
@@ -6,8 +6,8 @@
 angular.module('egCoreMod')
 
 .factory('egBilling', 
-       ['$modal','$q','egCore',
-function($modal , $q , egCore) {
+       ['$uibModal','$q','egCore',
+function($uibModal , $q , egCore) {
 
     var service = {};
 
@@ -112,11 +112,11 @@ function($modal , $q , egCore) {
     //   patron OR patron_id
     service.showBillDialog = function(args) {
 
-        return $modal.open({
+        return $uibModal.open({
             templateUrl: './circ/share/t_bill_patron_dialog',
             controller: 
-                   ['$scope','$modalInstance','$timeout','billingTypes','xact','patron',
-            function($scope , $modalInstance , $timeout , billingTypes , xact , patron) {
+                   ['$scope','$uibModalInstance','$timeout','billingTypes','xact','patron',
+            function($scope , $uibModalInstance , $timeout , billingTypes , xact , patron) {
                 console.debug('billing patron ' + patron.id());
                 $scope.focus = true;
                 if (xact && xact._isfieldmapper)
@@ -130,8 +130,8 @@ function($modal , $q , egCore) {
                     xact : xact,
                     patron_id : patron.id()
                 }
-                $scope.ok = function(args) { $modalInstance.close(args) }
-                $scope.cancel = function () { $modalInstance.dismiss() }
+                $scope.ok = function(args) { $uibModalInstance.close(args) }
+                $scope.cancel = function () { $uibModalInstance.dismiss() }
                 $scope.updateDefaultPrice = function() {
                     var type = billingTypes.filter(function(t) {
                         return t.id() == $scope.billArgs.billingType })[0];
index 2ff641b..e74cc78 100644 (file)
@@ -6,8 +6,8 @@ angular.module('egCoreMod')
 
 .factory('egCirc',
 
-       ['$modal','$q','egCore','egAlertDialog','egConfirmDialog',
-function($modal , $q , egCore , egAlertDialog , egConfirmDialog) {
+       ['$uibModal','$q','egCore','egAlertDialog','egConfirmDialog',
+function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog) {
 
     var service = {
         // auto-override these events after the first override
@@ -600,20 +600,20 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) {
     // the returned event.
     service.override_dialog = function(evt, params, options, action) {
         if (!angular.isArray(evt)) evt = [evt];
-        return $modal.open({
+        return $uibModal.open({
             templateUrl: './circ/share/t_event_override_dialog',
             controller: 
-                ['$scope', '$modalInstance', 
-                function($scope, $modalInstance) {
+                ['$scope', '$uibModalInstance', 
+                function($scope, $uibModalInstance) {
                 $scope.events = evt;
                 $scope.auto_override =
                     evt.filter(function(e){
                         return service.checkout_auto_override_after_first.indexOf(evt.textcode) > -1;
                     }).length > 0;
                 $scope.copy_barcode = params.copy_barcode; // may be null
-                $scope.ok = function() { $modalInstance.close() }
+                $scope.ok = function() { $uibModalInstance.close() }
                 $scope.cancel = function ($event) { 
-                    $modalInstance.dismiss();
+                    $uibModalInstance.dismiss();
                     $event.preventDefault();
                 }
             }]
@@ -638,14 +638,14 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) {
 
     service.copy_not_avail_dialog = function(evt, params, options) {
         if (angular.isArray(evt)) evt = evt[0];
-        return $modal.open({
+        return $uibModal.open({
             templateUrl: './circ/share/t_copy_not_avail_dialog',
             controller: 
-                       ['$scope','$modalInstance','copyStatus',
-                function($scope , $modalInstance , copyStatus) {
+                       ['$scope','$uibModalInstance','copyStatus',
+                function($scope , $uibModalInstance , copyStatus) {
                 $scope.copyStatus = copyStatus;
-                $scope.ok = function() {$modalInstance.close()}
-                $scope.cancel = function() {$modalInstance.dismiss()}
+                $scope.ok = function() {$uibModalInstance.close()}
+                $scope.cancel = function() {$uibModalInstance.dismiss()}
             }],
             resolve : {
                 copyStatus : function() {
@@ -678,18 +678,18 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) {
             params.noncat = true;
             var type = egCore.env.cnct.map[params.noncat_type];
 
-            return $modal.open({
+            return $uibModal.open({
                 templateUrl: './circ/share/t_noncat_dialog',
                 controller: 
-                    ['$scope', '$modalInstance',
-                    function($scope, $modalInstance) {
+                    ['$scope', '$uibModalInstance',
+                    function($scope, $uibModalInstance) {
                     $scope.focusMe = true;
                     $scope.type = type;
                     $scope.count = 1;
                     $scope.noncatMax = noncatMax;
-                    $scope.ok = function(count) { $modalInstance.close(count) }
+                    $scope.ok = function(count) { $uibModalInstance.close(count) }
                     $scope.cancel = function ($event) { 
-                        $modalInstance.dismiss() 
+                        $uibModalInstance.dismiss() 
                         $event.preventDefault();
                     }
                 }],
@@ -710,19 +710,19 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) {
     // Opens a dialog allowing the user to fill in pre-cat copy info.
     service.precat_dialog = function(params, options) {
 
-        return $modal.open({
+        return $uibModal.open({
             templateUrl: './circ/share/t_precat_dialog',
             controller: 
-                ['$scope', '$modalInstance', 'circMods',
-                function($scope, $modalInstance, circMods) {
+                ['$scope', '$uibModalInstance', 'circMods',
+                function($scope, $uibModalInstance, circMods) {
                 $scope.focusMe = true;
                 $scope.precatArgs = {
                     copy_barcode : params.copy_barcode,
                     circ_modifier : circMods.length ? circMods[0].code() : null
                 };
                 $scope.circModifiers = circMods;
-                $scope.ok = function(args) { $modalInstance.close(args) }
-                $scope.cancel = function () { $modalInstance.dismiss() }
+                $scope.ok = function(args) { $uibModalInstance.close(args) }
+                $scope.cancel = function () { $uibModalInstance.dismiss() }
             }],
             resolve : {
                 circMods : function() { 
@@ -771,14 +771,14 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) {
 
     service.copy_in_transit_dialog = function(evt, params, options) {
         if (angular.isArray(evt)) evt = evt[0];
-        return $modal.open({
+        return $uibModal.open({
             templateUrl: './circ/share/t_copy_in_transit_dialog',
             controller: 
-                       ['$scope','$modalInstance','transit',
-                function($scope , $modalInstance , transit) {
+                       ['$scope','$uibModalInstance','transit',
+                function($scope , $uibModalInstance , transit) {
                 $scope.transit = transit;
-                $scope.ok = function() { $modalInstance.close(transit) }
-                $scope.cancel = function() { $modalInstance.dismiss() }
+                $scope.ok = function() { $uibModalInstance.close(transit) }
+                $scope.cancel = function() { $uibModalInstance.dismiss() }
             }],
             resolve : {
                 // fetch the conflicting open transit w/ fleshed copy
@@ -845,17 +845,17 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) {
         var openCirc = evt.payload.old_circ;
         var sameUser = openCirc.usr() == params.patron_id;
         
-        return $modal.open({
+        return $uibModal.open({
             templateUrl: './circ/share/t_circ_exists_dialog',
             controller: 
-                       ['$scope','$modalInstance',
-                function($scope , $modalInstance) {
+                       ['$scope','$uibModalInstance',
+                function($scope , $uibModalInstance) {
                 $scope.args = {forgive_fines : false};
                 $scope.circDate = openCirc.xact_start();
                 $scope.sameUser = sameUser;
-                $scope.ok = function() { $modalInstance.close($scope.args) }
+                $scope.ok = function() { $uibModalInstance.close($scope.args) }
                 $scope.cancel = function($event) { 
-                    $modalInstance.dismiss();
+                    $uibModalInstance.dismiss();
                     $event.preventDefault(); // form, avoid calling ok();
                 }
             }]
@@ -892,11 +892,11 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) {
     }
 
     service.backdate_dialog = function(circ_ids) {
-        return $modal.open({
+        return $uibModal.open({
             templateUrl: './circ/share/t_backdate_dialog',
             controller: 
-                       ['$scope','$modalInstance',
-                function($scope , $modalInstance) {
+                       ['$scope','$uibModalInstance',
+                function($scope , $uibModalInstance) {
 
                 var today = new Date();
                 $scope.dialog = {
@@ -912,7 +912,7 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) {
 
 
                 $scope.cancel = function() { 
-                    $modalInstance.dismiss();
+                    $uibModalInstance.dismiss();
                 }
 
                 $scope.ok = function() { 
@@ -921,7 +921,7 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) {
                     service.batch_backdate(circ_ids, bd)
                     .then(
                         function() { // on complete
-                            $modalInstance.close({backdate : bd});
+                            $uibModalInstance.close({backdate : bd});
                         },
                         null,
                         function(resp) { // on response
@@ -981,11 +981,11 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) {
     service.mark_claims_returned_dialog = function(copy_barcodes) {
         if (!copy_barcodes.length) return;
 
-        return $modal.open({
+        return $uibModal.open({
             templateUrl: './circ/share/t_mark_claims_returned_dialog',
             controller: 
-                       ['$scope','$modalInstance',
-                function($scope , $modalInstance) {
+                       ['$scope','$uibModalInstance',
+                function($scope , $uibModalInstance) {
 
                 var today = new Date();
                 $scope.args = {
@@ -998,7 +998,7 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) {
                         $scope.args.backdate = today;
                 });
 
-                $scope.cancel = function() {$modalInstance.dismiss()}
+                $scope.cancel = function() {$uibModalInstance.dismiss()}
                 $scope.ok = function() { 
 
                     var date = $scope.args.date.toISOString().replace(/T.*/,'');
@@ -1011,7 +1011,7 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) {
                         var bc = copy_barcodes.pop();
                         if (!bc) {
                             deferred.resolve();
-                            $modalInstance.close();
+                            $uibModalInstance.close();
                             return;
                         }
 
@@ -1374,11 +1374,11 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) {
             if (options.auto_print_holds_transits) 
                 return print_transit();
 
-            return $modal.open({
+            return $uibModal.open({
                 templateUrl: tmpl,
                 controller: [
-                            '$scope','$modalInstance',
-                    function($scope , $modalInstance) {
+                            '$scope','$uibModalInstance',
+                    function($scope , $uibModalInstance) {
 
                     $scope.today = new Date();
 
@@ -1387,10 +1387,10 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) {
                         $scope[key] = val;
                     });
 
-                    $scope.ok = function() {$modalInstance.close()}
+                    $scope.ok = function() {$uibModalInstance.close()}
 
                     $scope.print = function() { 
-                        $modalInstance.close();
+                        $uibModalInstance.close();
                         print_transit();
                     }
                 }]
@@ -1422,14 +1422,14 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) {
         var ok = service.check_barcode(bc);
         if (ok) return $q.when();
 
-        return $modal.open({
+        return $uibModal.open({
             templateUrl: './circ/share/t_bad_barcode_dialog',
             controller: 
-                ['$scope', '$modalInstance', 
-                function($scope, $modalInstance) {
+                ['$scope', '$uibModalInstance', 
+                function($scope, $uibModalInstance) {
                 $scope.barcode = bc;
-                $scope.ok = function() { $modalInstance.close() }
-                $scope.cancel = function() { $modalInstance.dismiss() }
+                $scope.ok = function() { $uibModalInstance.close() }
+                $scope.cancel = function() { $uibModalInstance.dismiss() }
             }]
         }).result;
     }
@@ -1469,11 +1469,11 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) {
     }
 
     service.create_penalty = function(user_id) {
-        return $modal.open({
+        return $uibModal.open({
             templateUrl: './circ/share/t_new_message_dialog',
             controller: 
-                   ['$scope','$modalInstance','staffPenalties',
-            function($scope , $modalInstance , staffPenalties) {
+                   ['$scope','$uibModalInstance','staffPenalties',
+            function($scope , $uibModalInstance , staffPenalties) {
                 $scope.focusNote = true;
                 $scope.penalties = staffPenalties;
                 $scope.require_initials = service.require_initials;
@@ -1481,9 +1481,9 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) {
                 $scope.setPenalty = function(id) {
                     args.penalty = id;
                 }
-                $scope.ok = function(count) { $modalInstance.close($scope.args) }
+                $scope.ok = function(count) { $uibModalInstance.close($scope.args) }
                 $scope.cancel = function($event) { 
-                    $modalInstance.dismiss();
+                    $uibModalInstance.dismiss();
                     $event.preventDefault();
                 }
             }],
@@ -1509,11 +1509,11 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) {
 
     // assumes, for now anyway,  penalty type is fleshed onto usr_penalty.
     service.edit_penalty = function(usr_penalty) {
-        return $modal.open({
+        return $uibModal.open({
             templateUrl: './circ/share/t_new_message_dialog',
             controller: 
-                   ['$scope','$modalInstance','staffPenalties',
-            function($scope , $modalInstance , staffPenalties) {
+                   ['$scope','$uibModalInstance','staffPenalties',
+            function($scope , $uibModalInstance , staffPenalties) {
                 $scope.focusNote = true;
                 $scope.penalties = staffPenalties;
                 $scope.require_initials = service.require_initials;
@@ -1522,9 +1522,9 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) {
                     note : usr_penalty.note()
                 }
                 $scope.setPenalty = function(id) { args.penalty = id; }
-                $scope.ok = function(count) { $modalInstance.close($scope.args) }
+                $scope.ok = function(count) { $uibModalInstance.close($scope.args) }
                 $scope.cancel = function($event) { 
-                    $modalInstance.dismiss();
+                    $uibModalInstance.dismiss();
                     $event.preventDefault();
                 }
             }],
index ea83238..461f6ef 100644 (file)
@@ -6,8 +6,8 @@ angular.module('egCoreMod')
 
 .factory('egHolds',
 
-       ['$modal','$q','egCore','egConfirmDialog','egAlertDialog',
-function($modal , $q , egCore , egConfirmDialog , egAlertDialog) {
+       ['$uibModal','$q','egCore','egConfirmDialog','egAlertDialog',
+function($uibModal , $q , egCore , egConfirmDialog , egAlertDialog) {
 
     var service = {};
 
@@ -58,11 +58,11 @@ function($modal , $q , egCore , egConfirmDialog , egAlertDialog) {
 
     service.cancel_holds = function(hold_ids) {
        
-        return $modal.open({
+        return $uibModal.open({
             templateUrl : './circ/share/t_cancel_hold_dialog',
             controller : 
-                ['$scope', '$modalInstance', 'cancel_reasons',
-                function($scope, $modalInstance, cancel_reasons) {
+                ['$scope', '$uibModalInstance', 'cancel_reasons',
+                function($scope, $uibModalInstance, cancel_reasons) {
                     $scope.args = {
                         cancel_reason : 5,
                         cancel_reasons : cancel_reasons,
@@ -70,7 +70,7 @@ function($modal , $q , egCore , egConfirmDialog , egAlertDialog) {
                     };
                     
                     $scope.cancel = function($event) {
-                        $modalInstance.dismiss();
+                        $uibModalInstance.dismiss();
                         $event.preventDefault();
                     }
 
@@ -79,7 +79,7 @@ function($modal , $q , egCore , egConfirmDialog , egAlertDialog) {
                         function cancel_one() {
                             var hold_id = hold_ids.pop();
                             if (!hold_id) {
-                                $modalInstance.close();
+                                $uibModalInstance.close();
                                 return;
                             }
                             egCore.net.request(
@@ -110,17 +110,17 @@ function($modal , $q , egCore , egConfirmDialog , egAlertDialog) {
 
     service.uncancel_holds = function(hold_ids) {
        
-        return $modal.open({
+        return $uibModal.open({
             templateUrl : './circ/share/t_uncancel_hold_dialog',
             controller : 
-                ['$scope', '$modalInstance',
-                function($scope, $modalInstance) {
+                ['$scope', '$uibModalInstance',
+                function($scope, $uibModalInstance) {
                     $scope.args = {
                         num_holds : hold_ids.length
                     };
                     
                     $scope.cancel = function($event) {
-                        $modalInstance.dismiss();
+                        $uibModalInstance.dismiss();
                         $event.preventDefault();
                     }
 
@@ -129,7 +129,7 @@ function($modal , $q , egCore , egConfirmDialog , egAlertDialog) {
                         function uncancel_one() {
                             var hold_id = hold_ids.pop();
                             if (!hold_id) {
-                                $modalInstance.close();
+                                $uibModalInstance.close();
                                 return;
                             }
                             egCore.net.request(
@@ -170,22 +170,22 @@ function($modal , $q , egCore , egConfirmDialog , egAlertDialog) {
 
     service.set_copy_quality = function(hold_ids) {
         if (!hold_ids.length) return $q.when();
-        return $modal.open({
+        return $uibModal.open({
             templateUrl : './circ/share/t_hold_copy_quality_dialog',
             controller : 
-                ['$scope', '$modalInstance',
-                function($scope, $modalInstance) {
+                ['$scope', '$uibModalInstance',
+                function($scope, $uibModalInstance) {
 
                     function update(val) {
                         var vals = hold_ids.map(function(hold_id) {
                             return {id : hold_id, mint_condition : val}})
                         service.update_holds(vals).finally(function() {
-                            $modalInstance.close();
+                            $uibModalInstance.close();
                         });
                     }
                     $scope.good = function() { update(true) }
                     $scope.any = function() { update(false) }
-                    $scope.cancel = function() { $modalInstance.dismiss() }
+                    $scope.cancel = function() { $uibModalInstance.dismiss() }
                 }
             ]
         }).result;
@@ -193,11 +193,11 @@ function($modal , $q , egCore , egConfirmDialog , egAlertDialog) {
 
     service.edit_pickup_lib = function(hold_ids) {
         if (!hold_ids.length) return $q.when();
-        return $modal.open({
+        return $uibModal.open({
             templateUrl : './circ/share/t_hold_edit_pickup_lib',
             controller : 
-                ['$scope', '$modalInstance',
-                function($scope, $modalInstance) {
+                ['$scope', '$uibModalInstance',
+                function($scope, $uibModalInstance) {
                     $scope.cant_be_pickup = function (id) { return !egCore.org.CanHaveUsers(id); };
                     $scope.args = {};
                     $scope.ok = function() { 
@@ -208,10 +208,10 @@ function($modal , $q , egCore , egConfirmDialog , egAlertDialog) {
                             }
                         });
                         service.update_holds(vals).finally(function() {
-                            $modalInstance.close();
+                            $uibModalInstance.close();
                         });
                     }
-                    $scope.cancel = function() { $modalInstance.dismiss() }
+                    $scope.cancel = function() { $uibModalInstance.dismiss() }
                 }
             ]
         }).result;
@@ -225,11 +225,11 @@ function($modal , $q , egCore , egConfirmDialog , egAlertDialog) {
 
     service.edit_notify_prefs = function(hold_ids) {
         if (!hold_ids.length) return $q.when();
-        return $modal.open({
+        return $uibModal.open({
             templateUrl : './circ/share/t_hold_notification_prefs',
             controller : 
-                ['$scope', '$modalInstance', 'sms_carriers',
-                function($scope, $modalInstance, sms_carriers) {
+                ['$scope', '$uibModalInstance', 'sms_carriers',
+                function($scope, $uibModalInstance, sms_carriers) {
                     $scope.args = {}
                     $scope.sms_carriers = sms_carriers;
                     $scope.num_holds = hold_ids.length;
@@ -251,10 +251,10 @@ function($modal , $q , egCore , egConfirmDialog , egAlertDialog) {
                         });
 
                         service.update_holds(vals).finally(function() {
-                            $modalInstance.close();
+                            $uibModalInstance.close();
                         });
                     }
-                    $scope.cancel = function() { $modalInstance.dismiss() }
+                    $scope.cancel = function() { $uibModalInstance.dismiss() }
                 }
             ],
             resolve : {
@@ -285,11 +285,11 @@ function($modal , $q , egCore , egConfirmDialog , egAlertDialog) {
             return service.update_holds(vals);
         }
 
-        return $modal.open({
+        return $uibModal.open({
             templateUrl : './circ/share/t_hold_dates',
             controller : 
-                ['$scope', '$modalInstance',
-                function($scope, $modalInstance) {
+                ['$scope', '$uibModalInstance',
+                function($scope, $uibModalInstance) {
                     var today = new Date();
                     $scope.args = {
                         thaw_date : today,
@@ -299,9 +299,9 @@ function($modal , $q , egCore , egConfirmDialog , egAlertDialog) {
                     }
                     $scope.num_holds = hold_ids.length;
                     $scope.ok = function() { 
-                        relay_to_update($scope).then($modalInstance.close);
+                        relay_to_update($scope).then($uibModalInstance.close);
                     }
-                    $scope.cancel = function() { $modalInstance.dismiss() }
+                    $scope.cancel = function() { $uibModalInstance.dismiss() }
                 }
             ],
         }).result;
@@ -589,8 +589,8 @@ function($window , $location , $timeout , egCore , egHolds , egCirc) {
             showPatron : '='
         },
         controller : [
-                    '$scope','$modal','egCore','egHolds','egCirc',
-            function($scope , $modal , egCore , egHolds , egCirc) {
+                    '$scope','$uibModal','egCore','egHolds','egCirc',
+            function($scope , $uibModal , egCore , egHolds , egCirc) {
 
                 function draw() {
                     if (!$scope.holdId) return;
@@ -648,17 +648,17 @@ function($window , $location , $timeout , egCore , egHolds , egCirc) {
                 }
 
                 $scope.new_note = function() {
-                    return $modal.open({
+                    return $uibModal.open({
                         templateUrl : './circ/share/t_hold_note_dialog',
                         controller : 
-                            ['$scope', '$modalInstance',
-                            function($scope, $modalInstance) {
+                            ['$scope', '$uibModalInstance',
+                            function($scope, $uibModalInstance) {
                                 $scope.args = {};
                                 $scope.ok = function() {
-                                    $modalInstance.close($scope.args)
+                                    $uibModalInstance.close($scope.args)
                                 },
                                 $scope.cancel = function($event) {
-                                    $modalInstance.dismiss();
+                                    $uibModalInstance.dismiss();
                                     $event.preventDefault();
                                 }
                             }
@@ -678,17 +678,17 @@ function($window , $location , $timeout , egCore , egHolds , egCirc) {
                 }
 
                 $scope.new_notification = function() {
-                    return $modal.open({
+                    return $uibModal.open({
                         templateUrl : './circ/share/t_hold_notification_dialog',
                         controller : 
-                            ['$scope', '$modalInstance',
-                            function($scope, $modalInstance) {
+                            ['$scope', '$uibModalInstance',
+                            function($scope, $uibModalInstance) {
                                 $scope.args = {};
                                 $scope.ok = function() {
-                                    $modalInstance.close($scope.args)
+                                    $uibModalInstance.close($scope.args)
                                 },
                                 $scope.cancel = function($event) {
-                                    $modalInstance.dismiss();
+                                    $uibModalInstance.dismiss();
                                     $event.preventDefault();
                                 }
                             }
index 95a60d6..3808a67 100644 (file)
@@ -85,19 +85,19 @@ function($timeout , $parse) {
  */
 .factory('egAlertDialog', 
 
-        ['$modal','$interpolate',
-function($modal , $interpolate) {
+        ['$uibModal','$interpolate',
+function($uibModal , $interpolate) {
     var service = {};
 
     service.open = function(message, msg_scope) {
-        return $modal.open({
+        return $uibModal.open({
             templateUrl: './share/t_alert_dialog',
-            controller: ['$scope', '$modalInstance',
-                function($scope, $modalInstance) {
+            controller: ['$scope', '$uibModalInstance',
+                function($scope, $uibModalInstance) {
                     $scope.message = $interpolate(message)(msg_scope);
                     $scope.ok = function() {
                         if (msg_scope && msg_scope.ok) msg_scope.ok();
-                        $modalInstance.close()
+                        $uibModalInstance.close()
                     }
                 }
             ]
@@ -114,26 +114,26 @@ function($modal , $interpolate) {
  */
 .factory('egConfirmDialog', 
     
-       ['$modal','$interpolate',
-function($modal, $interpolate) {
+       ['$uibModal','$interpolate',
+function($uibModal, $interpolate) {
     var service = {};
 
     service.open = function(title, message, msg_scope, ok_button_label, cancel_button_label) {
-        return $modal.open({
+        return $uibModal.open({
             templateUrl: './share/t_confirm_dialog',
-            controller: ['$scope', '$modalInstance',
-                function($scope, $modalInstance) {
+            controller: ['$scope', '$uibModalInstance',
+                function($scope, $uibModalInstance) {
                     $scope.title = $interpolate(title)(msg_scope);
                     $scope.message = $interpolate(message)(msg_scope);
                     $scope.ok_button_label = $interpolate(ok_button_label || '')(msg_scope);
                     $scope.cancel_button_label = $interpolate(cancel_button_label || '')(msg_scope);
                     $scope.ok = function() {
                         if (msg_scope.ok) msg_scope.ok();
-                        $modalInstance.close()
+                        $uibModalInstance.close()
                     }
                     $scope.cancel = function() {
                         if (msg_scope.cancel) msg_scope.cancel();
-                        $modalInstance.dismiss();
+                        $uibModalInstance.dismiss();
                     }
                 }
             ]
@@ -156,25 +156,25 @@ function($modal, $interpolate) {
  */
 .factory('egPromptDialog', 
     
-       ['$modal','$interpolate',
-function($modal, $interpolate) {
+       ['$uibModal','$interpolate',
+function($uibModal, $interpolate) {
     var service = {};
 
     service.open = function(message, promptValue, msg_scope) {
-        return $modal.open({
+        return $uibModal.open({
             templateUrl: './share/t_prompt_dialog',
-            controller: ['$scope', '$modalInstance',
-                function($scope, $modalInstance) {
+            controller: ['$scope', '$uibModalInstance',
+                function($scope, $uibModalInstance) {
                     $scope.message = $interpolate(message)(msg_scope);
                     $scope.args = {value : promptValue || ''};
                     $scope.focus = true;
                     $scope.ok = function() {
                         if (msg_scope.ok) msg_scope.ok($scope.args.value);
-                        $modalInstance.close()
+                        $uibModalInstance.close()
                     }
                     $scope.cancel = function() {
                         if (msg_scope.cancel) msg_scope.cancel();
-                        $modalInstance.dismiss();
+                        $uibModalInstance.dismiss();
                     }
                 }
             ]