From 2b11355f7dc93ab52911bc22f9f58bcf8d9bf5c5 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Fri, 5 Aug 2016 11:59:36 -0400 Subject: [PATCH] update from $modal to $uibModal Signed-off-by: Galen Charlton --- .../web/js/ui/default/staff/admin/local/app.js | 12 +++++----- .../web/js/ui/default/staff/cat/volcopy/app.js | 10 ++++---- Open-ILS/web/js/ui/default/staff/services/ui.js | 28 +++++++++++----------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Open-ILS/web/js/ui/default/staff/admin/local/app.js b/Open-ILS/web/js/ui/default/staff/admin/local/app.js index efad40cb82..bf1eb224e9 100644 --- a/Open-ILS/web/js/ui/default/staff/admin/local/app.js +++ b/Open-ILS/web/js/ui/default/staff/admin/local/app.js @@ -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() } }] }); } diff --git a/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js b/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js index 1664541528..acd70bc186 100644 --- a/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js +++ b/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js @@ -1855,12 +1855,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; @@ -1910,11 +1910,11 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore , } - $modalInstance.close(); + $uibModalInstance.close(); } $scope.cancel = function($event) { - $modalInstance.dismiss(); + $uibModalInstance.dismiss(); $event.preventDefault(); } }] diff --git a/Open-ILS/web/js/ui/default/staff/services/ui.js b/Open-ILS/web/js/ui/default/staff/services/ui.js index 92fc2c4411..f1d84591df 100644 --- a/Open-ILS/web/js/ui/default/staff/services/ui.js +++ b/Open-ILS/web/js/ui/default/staff/services/ui.js @@ -551,15 +551,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', @@ -600,11 +600,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(); } } ] @@ -618,8 +618,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) { @@ -630,10 +630,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(); @@ -720,11 +720,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(); } } ] -- 2.11.0