update from $modal to $uibModal
authorGalen Charlton <gmc@esilibrary.com>
Fri, 5 Aug 2016 15:59:36 +0000 (11:59 -0400)
committerGalen Charlton <gmc@equinoxinitiative.org>
Fri, 3 Nov 2017 20:04:16 +0000 (16:04 -0400)
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Open-ILS/web/js/ui/default/staff/admin/local/app.js
Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
Open-ILS/web/js/ui/default/staff/services/ui.js

index efad40c..bf1eb22 100644 (file)
@@ -127,8 +127,8 @@ function($scope , $location , egCore , $timeout) {
 }])
 
 .controller('AutoGridEditorCtl',
-       ['$scope','$route','$location','egCore','$timeout','egConfirmDialog','$modal',
-function($scope , $route , $location , egCore , $timeout , egConfirmDialog , $modal) {
+       ['$scope','$route','$location','egCore','$timeout','egConfirmDialog','$uibModal',
+function($scope , $route , $location , egCore , $timeout , egConfirmDialog , $uibModal) {
 
     $scope.funcs = {};
 
@@ -148,11 +148,11 @@ function($scope , $route , $location , egCore , $timeout , egConfirmDialog , $mo
     $scope.gridControls.setQuery({id : {'!=' : null}});
 
     function openCreateEditDialog(id) {
-        return $modal.open({
+        return $uibModal.open({
             templateUrl : './admin/local/autoGridEditor/' + $scope.baseFmClass,
             scope : $scope,
             controller :
-                ['$scope', '$modalInstance', function($scope, $modalInstance) {
+                ['$scope', '$uibModalInstance', function($scope, $uibModalInstance) {
                 $scope.creating = id ? false : true;
                 angular.forEach($scope.$parent.createEditPrefetch, function(where, fmClass) {
                     egCore.pcrud.search(
@@ -172,8 +172,8 @@ function($scope , $route , $location , egCore , $timeout , egConfirmDialog , $mo
                         });
                     });
                 }
-                $scope.ok = function(record) { $modalInstance.close(record) };
-                $scope.cancel = function () { $modalInstance.dismiss() }
+                $scope.ok = function(record) { $uibModalInstance.close(record) };
+                $scope.cancel = function () { $uibModalInstance.dismiss() }
             }]
         });
     }
index 1e21319..aed6e88 100644 (file)
@@ -1876,12 +1876,12 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
     $scope.copy_alerts_dialog = function(copy_list) {
         if (!angular.isArray(copy_list)) copy_list = [copy_list];
 
-        return $modal.open({
+        return $uibModal.open({
             templateUrl: './cat/volcopy/t_copy_alerts',
             animation: true,
             controller:
-                   ['$scope','$modalInstance',
-            function($scope , $modalInstance) {
+                   ['$scope','$uibModalInstance',
+            function($scope , $uibModalInstance) {
 
                 itemSvc.get_copy_alert_types().then(function(ccat) {
                     $scope.alert_types = ccat;
@@ -1931,11 +1931,11 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
 
                     }
 
-                    $modalInstance.close();
+                    $uibModalInstance.close();
                 }
 
                 $scope.cancel = function($event) {
-                    $modalInstance.dismiss();
+                    $uibModalInstance.dismiss();
                     $event.preventDefault();
                 }
             }]
index 9aeca7d..e0cfb3c 100644 (file)
@@ -575,15 +575,15 @@ function($window , egStrings) {
  * egAddCopyAlertDialog - manage copy alerts
  */
 .factory('egAddCopyAlertDialog', 
-       ['$modal','$interpolate','egCore',
-function($modal , $interpolate , egCore) {
+       ['$uibModal','$interpolate','egCore',
+function($uibModal , $interpolate , egCore) {
     var service = {};
 
     service.open = function(args) {
-        return $modal.open({
+        return $uibModal.open({
             templateUrl: './share/t_add_copy_alert_dialog',
-            controller: ['$scope','$q','$modalInstance',
-                function( $scope , $q , $modalInstance) {
+            controller: ['$scope','$q','$uibModalInstance',
+                function( $scope , $q , $uibModalInstance) {
 
                     $scope.copy_ids = args.copy_ids;
                     egCore.pcrud.search('ccat',
@@ -624,11 +624,11 @@ function($modal , $interpolate , egCore) {
                             }
                         }
                         if (args.ok) args.ok();
-                        $modalInstance.close()
+                        $uibModalInstance.close()
                     }
                     $scope.cancel = function() {
                         if (args.cancel) args.cancel();
-                        $modalInstance.dismiss();
+                        $uibModalInstance.dismiss();
                     }
                 }
             ]
@@ -642,8 +642,8 @@ function($modal , $interpolate , egCore) {
  * egCopyAlertManagerDialog - manage copy alerts
  */
 .factory('egCopyAlertManagerDialog', 
-       ['$modal','$interpolate','egCore',
-function($modal , $interpolate , egCore) {
+       ['$uibModal','$interpolate','egCore',
+function($uibModal , $interpolate , egCore) {
     var service = {};
 
     service.get_user_copy_alerts = function(copy_id) {
@@ -654,10 +654,10 @@ function($modal , $interpolate , egCore) {
     }
 
     service.open = function(args) {
-        return $modal.open({
+        return $uibModal.open({
             templateUrl: './share/t_copy_alert_manager_dialog',
-            controller: ['$scope','$q','$modalInstance',
-                function( $scope , $q , $modalInstance) {
+            controller: ['$scope','$q','$uibModalInstance',
+                function( $scope , $q , $uibModalInstance) {
 
                     function init(args) {
                         var defer = $q.defer();
@@ -744,11 +744,11 @@ function($modal , $interpolate , egCore) {
                             egCore.pcrud.apply(acks);
                         }
                         if (args.ok) args.ok($scope.params.the_next_status);
-                        $modalInstance.close()
+                        $uibModalInstance.close()
                     }
                     $scope.cancel = function() {
                         if (args.cancel) args.cancel();
-                        $modalInstance.dismiss();
+                        $uibModalInstance.dismiss();
                     }
                 }
             ]