You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2016/10/17 15:34:37 UTC
[14/42] incubator-trafficcontrol git commit: fixes redirect on create
failure
fixes redirect on create failure
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/270ffb7f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/270ffb7f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/270ffb7f
Branch: refs/heads/psql
Commit: 270ffb7f5c4fc9be0fc250a786cf3af340e3993e
Parents: da5ec0a
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Thu Oct 13 15:30:45 2016 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Thu Oct 13 15:30:45 2016 -0600
----------------------------------------------------------------------
.../ui/app/src/common/api/ASNService.js | 19 ++++++++++---------
.../ui/app/src/common/api/CDNService.js | 5 +++--
.../ui/app/src/common/api/CacheGroupService.js | 5 +++--
.../app/src/common/api/DeliveryServiceService.js | 19 ++++++++++---------
.../ui/app/src/common/api/DivisionService.js | 5 +++--
.../ui/app/src/common/api/LocationService.js | 6 ++++--
.../ui/app/src/common/api/ParameterService.js | 5 +++--
.../ui/app/src/common/api/ProfileService.js | 5 +++--
.../ui/app/src/common/api/ServerService.js | 19 ++++++++++---------
.../ui/app/src/common/api/StatusService.js | 5 +++--
.../ui/app/src/common/api/TypeService.js | 5 +++--
.../ui/app/src/common/api/UserService.js | 5 +++--
.../modules/form/asn/new/FormNewASNController.js | 9 +++------
.../new/FormNewCacheGroupController.js | 9 +++------
.../modules/form/cdn/new/FormNewCDNController.js | 9 +++------
.../form.deliveryService.tpl.html | 2 +-
.../new/FormNewDeliveryServiceController.js | 9 +++------
.../division/new/FormNewDivisionController.js | 9 +++------
.../location/new/FormNewLocationController.js | 9 +++------
.../parameter/new/FormNewParameterController.js | 9 +++------
.../form/profile/new/FormNewProfileController.js | 9 +++------
.../form/server/new/FormNewServerController.js | 9 +++------
.../form/status/new/FormNewStatusController.js | 9 +++------
.../form/type/new/FormNewTypeController.js | 9 +++------
.../form/user/new/FormNewUserController.js | 9 +++------
25 files changed, 95 insertions(+), 118 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/270ffb7f/traffic_ops/experimental/ui/app/src/common/api/ASNService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/ASNService.js b/traffic_ops/experimental/ui/app/src/common/api/ASNService.js
index 6b6aa14..31a6472 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/ASNService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/ASNService.js
@@ -1,4 +1,4 @@
-var ASNService = function(Restangular, messageModel) {
+var ASNService = function(Restangular, locationUtils, messageModel) {
this.getASNs = function() {
return Restangular.all('asns').getList();
@@ -11,13 +11,14 @@ var ASNService = function(Restangular, messageModel) {
this.createASN = function(asn) {
return Restangular.service('asns').post(asn)
.then(
- function() {
- messageModel.setMessages([ { level: 'success', text: 'ASN created' } ], true);
- },
- function() {
- messageModel.setMessages([ { level: 'error', text: 'ASN create failed' } ], false);
- }
- );
+ function() {
+ messageModel.setMessages([ { level: 'success', text: 'ASN created' } ], true);
+ locationUtils.navigateToPath('/admin/asns');
+ },
+ function() {
+ messageModel.setMessages([ { level: 'error', text: 'ASN create failed' } ], false);
+ }
+ );
};
this.updateASN = function(asn) {
@@ -46,5 +47,5 @@ var ASNService = function(Restangular, messageModel) {
};
-ASNService.$inject = ['Restangular', 'messageModel'];
+ASNService.$inject = ['Restangular', 'locationUtils', 'messageModel'];
module.exports = ASNService;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/270ffb7f/traffic_ops/experimental/ui/app/src/common/api/CDNService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/CDNService.js b/traffic_ops/experimental/ui/app/src/common/api/CDNService.js
index aa5f434..f633146 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/CDNService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/CDNService.js
@@ -1,4 +1,4 @@
-var CDNService = function(Restangular, messageModel) {
+var CDNService = function(Restangular, locationUtils, messageModel) {
this.getCDNs = function() {
return Restangular.all('cdns').getList();
@@ -13,6 +13,7 @@ var CDNService = function(Restangular, messageModel) {
.then(
function() {
messageModel.setMessages([ { level: 'success', text: 'CDN created' } ], true);
+ locationUtils.navigateToPath('/admin/cdns');
},
function() {
messageModel.setMessages([ { level: 'error', text: 'CDN create failed' } ], false);
@@ -46,5 +47,5 @@ var CDNService = function(Restangular, messageModel) {
};
-CDNService.$inject = ['Restangular', 'messageModel'];
+CDNService.$inject = ['Restangular', 'locationUtils', 'messageModel'];
module.exports = CDNService;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/270ffb7f/traffic_ops/experimental/ui/app/src/common/api/CacheGroupService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/CacheGroupService.js b/traffic_ops/experimental/ui/app/src/common/api/CacheGroupService.js
index 023074a..34ee0e6 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/CacheGroupService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/CacheGroupService.js
@@ -1,4 +1,4 @@
-var CacheGroupService = function(Restangular, messageModel) {
+var CacheGroupService = function(Restangular, locationUtils, messageModel) {
this.getCacheGroups = function() {
return Restangular.all('cachegroups').getList();
@@ -13,6 +13,7 @@ var CacheGroupService = function(Restangular, messageModel) {
.then(
function() {
messageModel.setMessages([ { level: 'success', text: 'CacheGroup created' } ], true);
+ locationUtils.navigateToPath('/configure/cache-groups');
},
function() {
messageModel.setMessages([ { level: 'error', text: 'CacheGroup create failed' } ], false);
@@ -46,5 +47,5 @@ var CacheGroupService = function(Restangular, messageModel) {
};
-CacheGroupService.$inject = ['Restangular', 'messageModel'];
+CacheGroupService.$inject = ['Restangular', 'locationUtils', 'messageModel'];
module.exports = CacheGroupService;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/270ffb7f/traffic_ops/experimental/ui/app/src/common/api/DeliveryServiceService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/DeliveryServiceService.js b/traffic_ops/experimental/ui/app/src/common/api/DeliveryServiceService.js
index d38dabc..b05f94b 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/DeliveryServiceService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/DeliveryServiceService.js
@@ -1,4 +1,4 @@
-var DeliveryServiceService = function(Restangular, messageModel) {
+var DeliveryServiceService = function(Restangular, locationUtils, messageModel) {
this.getDeliveryServices = function() {
return Restangular.all('deliveryservices').getList();
@@ -11,13 +11,14 @@ var DeliveryServiceService = function(Restangular, messageModel) {
this.createDeliveryService = function(deliveryService) {
return Restangular.service('deliveryservices').post(deliveryService)
.then(
- function() {
- messageModel.setMessages([ { level: 'success', text: 'DeliveryService created' } ], true);
- },
- function() {
- messageModel.setMessages([ { level: 'error', text: 'DeliveryService create failed' } ], false);
- }
- );
+ function() {
+ messageModel.setMessages([ { level: 'success', text: 'DeliveryService created' } ], true);
+ locationUtils.navigateToPath('/configure/delivery-services');
+ },
+ function() {
+ messageModel.setMessages([ { level: 'error', text: 'DeliveryService create failed' } ], false);
+ }
+ );
};
this.updateDeliveryService = function(deliveryService) {
@@ -46,5 +47,5 @@ var DeliveryServiceService = function(Restangular, messageModel) {
};
-DeliveryServiceService.$inject = ['Restangular', 'messageModel'];
+DeliveryServiceService.$inject = ['Restangular', 'locationUtils', 'messageModel'];
module.exports = DeliveryServiceService;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/270ffb7f/traffic_ops/experimental/ui/app/src/common/api/DivisionService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/DivisionService.js b/traffic_ops/experimental/ui/app/src/common/api/DivisionService.js
index 0c8e95c..cd0108b 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/DivisionService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/DivisionService.js
@@ -1,4 +1,4 @@
-var DivisionService = function(Restangular, messageModel) {
+var DivisionService = function(Restangular, locationUtils, messageModel) {
this.getDivisions = function() {
return Restangular.all('divisions').getList();
@@ -13,6 +13,7 @@ var DivisionService = function(Restangular, messageModel) {
.then(
function() {
messageModel.setMessages([ { level: 'success', text: 'Division created' } ], true);
+ locationUtils.navigateToPath('/admin/divisions');
},
function() {
messageModel.setMessages([ { level: 'error', text: 'Division create failed' } ], false);
@@ -46,5 +47,5 @@ var DivisionService = function(Restangular, messageModel) {
};
-DivisionService.$inject = ['Restangular', 'messageModel'];
+DivisionService.$inject = ['Restangular', 'locationUtils', 'messageModel'];
module.exports = DivisionService;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/270ffb7f/traffic_ops/experimental/ui/app/src/common/api/LocationService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/LocationService.js b/traffic_ops/experimental/ui/app/src/common/api/LocationService.js
index 23ea7c8..b177dc9 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/LocationService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/LocationService.js
@@ -1,4 +1,4 @@
-var LocationService = function(Restangular, messageModel) {
+var LocationService = function(Restangular, locationUtils, messageModel) {
this.getLocations = function() {
return Restangular.all('phys_locations').getList();
@@ -13,6 +13,8 @@ var LocationService = function(Restangular, messageModel) {
.then(
function() {
messageModel.setMessages([ { level: 'success', text: 'Location created' } ], true);
+ locationUtils.navigateToPath('/admin/locations');
+
},
function() {
messageModel.setMessages([ { level: 'error', text: 'Location create failed' } ], false);
@@ -46,5 +48,5 @@ var LocationService = function(Restangular, messageModel) {
};
-LocationService.$inject = ['Restangular', 'messageModel'];
+LocationService.$inject = ['Restangular', 'locationUtils', 'messageModel'];
module.exports = LocationService;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/270ffb7f/traffic_ops/experimental/ui/app/src/common/api/ParameterService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/ParameterService.js b/traffic_ops/experimental/ui/app/src/common/api/ParameterService.js
index bd6d391..1a7b6a0 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/ParameterService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/ParameterService.js
@@ -1,4 +1,4 @@
-var ParameterService = function(Restangular, messageModel) {
+var ParameterService = function(Restangular, locationUtils, messageModel) {
this.getParameters = function() {
return Restangular.all('parameters').getList();
@@ -13,6 +13,7 @@ var ParameterService = function(Restangular, messageModel) {
.then(
function() {
messageModel.setMessages([ { level: 'success', text: 'Parameter created' } ], true);
+ locationUtils.navigateToPath('/admin/parameters');
},
function() {
messageModel.setMessages([ { level: 'error', text: 'Parameter create failed' } ], false);
@@ -46,5 +47,5 @@ var ParameterService = function(Restangular, messageModel) {
};
-ParameterService.$inject = ['Restangular', 'messageModel'];
+ParameterService.$inject = ['Restangular', 'locationUtils', 'messageModel'];
module.exports = ParameterService;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/270ffb7f/traffic_ops/experimental/ui/app/src/common/api/ProfileService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/ProfileService.js b/traffic_ops/experimental/ui/app/src/common/api/ProfileService.js
index d350318..4b1422b 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/ProfileService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/ProfileService.js
@@ -1,4 +1,4 @@
-var ProfileService = function(Restangular, messageModel) {
+var ProfileService = function(Restangular, locationUtils, messageModel) {
this.getProfiles = function() {
return Restangular.all('profiles').getList();
@@ -13,6 +13,7 @@ var ProfileService = function(Restangular, messageModel) {
.then(
function() {
messageModel.setMessages([ { level: 'success', text: 'Profile created' } ], true);
+ locationUtils.navigateToPath('/admin/profiles');
},
function() {
messageModel.setMessages([ { level: 'error', text: 'Profile create failed' } ], false);
@@ -46,5 +47,5 @@ var ProfileService = function(Restangular, messageModel) {
};
-ProfileService.$inject = ['Restangular', 'messageModel'];
+ProfileService.$inject = ['Restangular', 'locationUtils', 'messageModel'];
module.exports = ProfileService;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/270ffb7f/traffic_ops/experimental/ui/app/src/common/api/ServerService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/ServerService.js b/traffic_ops/experimental/ui/app/src/common/api/ServerService.js
index a9b6de6..1aa58b7 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/ServerService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/ServerService.js
@@ -1,4 +1,4 @@
-var ServerService = function(Restangular, messageModel) {
+var ServerService = function(Restangular, locationUtils, messageModel) {
this.getServers = function() {
return Restangular.all('servers').getList();
@@ -11,13 +11,14 @@ var ServerService = function(Restangular, messageModel) {
this.createServer = function(server) {
return Restangular.service('servers').post(server)
.then(
- function() {
- messageModel.setMessages([ { level: 'success', text: 'Server created' } ], true);
- },
- function() {
- messageModel.setMessages([ { level: 'error', text: 'Server create failed' } ], false);
- }
- );
+ function() {
+ messageModel.setMessages([ { level: 'success', text: 'Server created' } ], true);
+ locationUtils.navigateToPath('/configure/servers');
+ },
+ function() {
+ messageModel.setMessages([ { level: 'error', text: 'Server create failed' } ], false);
+ }
+ );
};
this.updateServer = function(server) {
@@ -46,5 +47,5 @@ var ServerService = function(Restangular, messageModel) {
};
-ServerService.$inject = ['Restangular', 'messageModel'];
+ServerService.$inject = ['Restangular', 'locationUtils', 'messageModel'];
module.exports = ServerService;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/270ffb7f/traffic_ops/experimental/ui/app/src/common/api/StatusService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/StatusService.js b/traffic_ops/experimental/ui/app/src/common/api/StatusService.js
index d31896c..0854d96 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/StatusService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/StatusService.js
@@ -1,4 +1,4 @@
-var StatusService = function(Restangular, messageModel) {
+var StatusService = function(Restangular, locationUtils, messageModel) {
this.getStatuses = function() {
return Restangular.all('statuses').getList();
@@ -13,6 +13,7 @@ var StatusService = function(Restangular, messageModel) {
.then(
function() {
messageModel.setMessages([ { level: 'success', text: 'Status created' } ], true);
+ locationUtils.navigateToPath('/admin/statuses');
},
function() {
messageModel.setMessages([ { level: 'error', text: 'Status create failed' } ], false);
@@ -46,5 +47,5 @@ var StatusService = function(Restangular, messageModel) {
};
-StatusService.$inject = ['Restangular', 'messageModel'];
+StatusService.$inject = ['Restangular', 'locationUtils', 'messageModel'];
module.exports = StatusService;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/270ffb7f/traffic_ops/experimental/ui/app/src/common/api/TypeService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/TypeService.js b/traffic_ops/experimental/ui/app/src/common/api/TypeService.js
index 7bfe3bc..e943d3a 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/TypeService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/TypeService.js
@@ -1,4 +1,4 @@
-var TypeService = function(Restangular, messageModel) {
+var TypeService = function(Restangular, locationUtils, messageModel) {
this.getTypes = function() {
return Restangular.all('types').getList();
@@ -13,6 +13,7 @@ var TypeService = function(Restangular, messageModel) {
.then(
function() {
messageModel.setMessages([ { level: 'success', text: 'Type created' } ], true);
+ locationUtils.navigateToPath('/admin/types');
},
function() {
messageModel.setMessages([ { level: 'error', text: 'Type create failed' } ], false);
@@ -46,5 +47,5 @@ var TypeService = function(Restangular, messageModel) {
};
-TypeService.$inject = ['Restangular', 'messageModel'];
+TypeService.$inject = ['Restangular', 'locationUtils', 'messageModel'];
module.exports = TypeService;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/270ffb7f/traffic_ops/experimental/ui/app/src/common/api/UserService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/UserService.js b/traffic_ops/experimental/ui/app/src/common/api/UserService.js
index 13335c2..261f0a0 100755
--- a/traffic_ops/experimental/ui/app/src/common/api/UserService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/UserService.js
@@ -1,4 +1,4 @@
-var UserService = function(Restangular, $http, $location, $q, authService, userModel, messageModel, ENV) {
+var UserService = function(Restangular, $http, $location, $q, authService, locationUtils, userModel, messageModel, ENV) {
var service = this;
@@ -55,6 +55,7 @@ var UserService = function(Restangular, $http, $location, $q, authService, userM
.then(
function() {
messageModel.setMessages([ { level: 'success', text: 'User created' } ], true);
+ locationUtils.navigateToPath('/admin/users');
},
function() {
messageModel.setMessages([ { level: 'error', text: 'User create failed' } ], false);
@@ -88,5 +89,5 @@ var UserService = function(Restangular, $http, $location, $q, authService, userM
};
-UserService.$inject = ['Restangular', '$http', '$location', '$q', 'authService', 'userModel', 'messageModel', 'ENV'];
+UserService.$inject = ['Restangular', '$http', '$location', '$q', 'authService', 'locationUtils', 'userModel', 'messageModel', 'ENV'];
module.exports = UserService;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/270ffb7f/traffic_ops/experimental/ui/app/src/common/modules/form/asn/new/FormNewASNController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/asn/new/FormNewASNController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/asn/new/FormNewASNController.js
index f7c08a6..7cace29 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/asn/new/FormNewASNController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/asn/new/FormNewASNController.js
@@ -1,4 +1,4 @@
-var FormNewASNController = function(asn, $scope, $controller, locationUtils, asnService) {
+var FormNewASNController = function(asn, $scope, $controller, asnService) {
// extends the FormASNController to inherit common methods
angular.extend(this, $controller('FormASNController', { asn: asn, $scope: $scope }));
@@ -11,13 +11,10 @@ var FormNewASNController = function(asn, $scope, $controller, locationUtils, asn
};
$scope.save = function(asn) {
- asnService.createASN(asn).
- then(function() {
- locationUtils.navigateToPath('/admin/asns');
- });
+ asnService.createASN(asn);
};
};
-FormNewASNController.$inject = ['asn', '$scope', '$controller', 'locationUtils', 'asnService'];
+FormNewASNController.$inject = ['asn', '$scope', '$controller', 'asnService'];
module.exports = FormNewASNController;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/270ffb7f/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/new/FormNewCacheGroupController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/new/FormNewCacheGroupController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/new/FormNewCacheGroupController.js
index 3157ecf..0c78a1a 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/new/FormNewCacheGroupController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/cacheGroup/new/FormNewCacheGroupController.js
@@ -1,4 +1,4 @@
-var FormNewCacheGroupController = function(cacheGroup, $scope, $controller, locationUtils, cacheGroupService) {
+var FormNewCacheGroupController = function(cacheGroup, $scope, $controller, cacheGroupService) {
// extends the FormCacheGroupController to inherit common methods
angular.extend(this, $controller('FormCacheGroupController', { cacheGroup: cacheGroup, $scope: $scope }));
@@ -11,13 +11,10 @@ var FormNewCacheGroupController = function(cacheGroup, $scope, $controller, loca
};
$scope.save = function(cacheGroup) {
- cacheGroupService.createCacheGroup(cacheGroup).
- then(function() {
- locationUtils.navigateToPath('/configure/cache-groups');
- });
+ cacheGroupService.createCacheGroup(cacheGroup);
};
};
-FormNewCacheGroupController.$inject = ['cacheGroup', '$scope', '$controller', 'locationUtils', 'cacheGroupService'];
+FormNewCacheGroupController.$inject = ['cacheGroup', '$scope', '$controller', 'cacheGroupService'];
module.exports = FormNewCacheGroupController;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/270ffb7f/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/new/FormNewCDNController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/new/FormNewCDNController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/new/FormNewCDNController.js
index 40b42cc..dc517a8 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/new/FormNewCDNController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/cdn/new/FormNewCDNController.js
@@ -1,4 +1,4 @@
-var FormNewCDNController = function(cdn, $scope, $controller, locationUtils, cdnService) {
+var FormNewCDNController = function(cdn, $scope, $controller, cdnService) {
// extends the FormCDNController to inherit common methods
angular.extend(this, $controller('FormCDNController', { cdn: cdn, $scope: $scope }));
@@ -11,13 +11,10 @@ var FormNewCDNController = function(cdn, $scope, $controller, locationUtils, cdn
};
$scope.save = function(cdn) {
- cdnService.createCDN(cdn).
- then(function() {
- locationUtils.navigateToPath('/admin/cdns');
- });
+ cdnService.createCDN(cdn)
};
};
-FormNewCDNController.$inject = ['cdn', '$scope', '$controller', 'locationUtils', 'cdnService'];
+FormNewCDNController.$inject = ['cdn', '$scope', '$controller', 'cdnService'];
module.exports = FormNewCDNController;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/270ffb7f/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.tpl.html
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.tpl.html b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.tpl.html
index e66c966..2b63a22 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.tpl.html
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/form.deliveryService.tpl.html
@@ -236,7 +236,7 @@
<div class="form-group" ng-class="{'has-error': hasError(deliveryServiceForm.multiSiteOriginAlgorithm), 'has-feedback': hasError(deliveryServiceForm.multiSiteOriginAlgorithm)}">
<label class="control-label col-md-2 col-sm-2 col-xs-12">Multi Site Origin Algorithm</label>
<div class="col-md-10 col-sm-10 col-xs-12">
- <select id="multiSiteOriginAlgorithm" name="multiSiteOriginAlgorithm" class="form-control" ng-model="deliveryService.multiSiteOriginAlgorithm" ng-options="msoAlgo.value as msoAlgo.label for msoAlgo in msoAlgos" required>
+ <select id="multiSiteOriginAlgorithm" name="multiSiteOriginAlgorithm" class="form-control" ng-model="deliveryService.multiSiteOriginAlgorithm" ng-options="msoAlgo.value as msoAlgo.label for msoAlgo in msoAlgos">
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.multiSiteOriginAlgorithm, 'required')">Required</small>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/270ffb7f/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/new/FormNewDeliveryServiceController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/new/FormNewDeliveryServiceController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/new/FormNewDeliveryServiceController.js
index 7632da1..839b138 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/new/FormNewDeliveryServiceController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/deliveryService/new/FormNewDeliveryServiceController.js
@@ -1,4 +1,4 @@
-var FormNewDeliveryServiceController = function(deliveryService, $scope, $controller, locationUtils, deliveryServiceService) {
+var FormNewDeliveryServiceController = function(deliveryService, $scope, $controller, deliveryServiceService) {
// extends the FormDeliveryServiceController to inherit common methods
angular.extend(this, $controller('FormDeliveryServiceController', { deliveryService: deliveryService, $scope: $scope }));
@@ -11,13 +11,10 @@ var FormNewDeliveryServiceController = function(deliveryService, $scope, $contro
};
$scope.save = function(deliveryService) {
- deliveryServiceService.createDeliveryService(deliveryService).
- then(function() {
- locationUtils.navigateToPath('/configure/delivery-services');
- });
+ deliveryServiceService.createDeliveryService(deliveryService);
};
};
-FormNewDeliveryServiceController.$inject = ['deliveryService', '$scope', '$controller', 'locationUtils', 'deliveryServiceService'];
+FormNewDeliveryServiceController.$inject = ['deliveryService', '$scope', '$controller', 'deliveryServiceService'];
module.exports = FormNewDeliveryServiceController;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/270ffb7f/traffic_ops/experimental/ui/app/src/common/modules/form/division/new/FormNewDivisionController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/division/new/FormNewDivisionController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/division/new/FormNewDivisionController.js
index f4fc7a3..2e91c9c 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/division/new/FormNewDivisionController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/division/new/FormNewDivisionController.js
@@ -1,4 +1,4 @@
-var FormNewDivisionController = function(division, $scope, $controller, locationUtils, divisionService) {
+var FormNewDivisionController = function(division, $scope, $controller, divisionService) {
// extends the FormDivisionController to inherit common methods
angular.extend(this, $controller('FormDivisionController', { division: division, $scope: $scope }));
@@ -11,13 +11,10 @@ var FormNewDivisionController = function(division, $scope, $controller, location
};
$scope.save = function(division) {
- divisionService.createDivision(division).
- then(function() {
- locationUtils.navigateToPath('/admin/divisions');
- });
+ divisionService.createDivision(division)
};
};
-FormNewDivisionController.$inject = ['division', '$scope', '$controller', 'locationUtils', 'divisionService'];
+FormNewDivisionController.$inject = ['division', '$scope', '$controller', 'divisionService'];
module.exports = FormNewDivisionController;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/270ffb7f/traffic_ops/experimental/ui/app/src/common/modules/form/location/new/FormNewLocationController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/location/new/FormNewLocationController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/location/new/FormNewLocationController.js
index 6eee781..2d83277 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/location/new/FormNewLocationController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/location/new/FormNewLocationController.js
@@ -1,4 +1,4 @@
-var FormNewLocationController = function(location, $scope, $controller, locationUtils, locationService) {
+var FormNewLocationController = function(location, $scope, $controller, locationService) {
// extends the FormLocationController to inherit common methods
angular.extend(this, $controller('FormLocationController', { location: location, $scope: $scope }));
@@ -11,13 +11,10 @@ var FormNewLocationController = function(location, $scope, $controller, location
};
$scope.save = function(location) {
- locationService.createLocation(location).
- then(function() {
- locationUtils.navigateToPath('/admin/locations');
- });
+ locationService.createLocation(location);
};
};
-FormNewLocationController.$inject = ['location', '$scope', '$controller', 'locationUtils', 'locationService'];
+FormNewLocationController.$inject = ['location', '$scope', '$controller', 'locationService'];
module.exports = FormNewLocationController;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/270ffb7f/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/new/FormNewParameterController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/new/FormNewParameterController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/new/FormNewParameterController.js
index 8bc36b6..fa03765 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/new/FormNewParameterController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/parameter/new/FormNewParameterController.js
@@ -1,4 +1,4 @@
-var FormNewParameterController = function(parameter, $scope, $controller, locationUtils, parameterService) {
+var FormNewParameterController = function(parameter, $scope, $controller, parameterService) {
// extends the FormParameterController to inherit common methods
angular.extend(this, $controller('FormParameterController', { parameter: parameter, $scope: $scope }));
@@ -11,13 +11,10 @@ var FormNewParameterController = function(parameter, $scope, $controller, locati
};
$scope.save = function(parameter) {
- parameterService.createParameter(parameter).
- then(function() {
- locationUtils.navigateToPath('/admin/parameters');
- });
+ parameterService.createParameter(parameter);
};
};
-FormNewParameterController.$inject = ['parameter', '$scope', '$controller', 'locationUtils', 'parameterService'];
+FormNewParameterController.$inject = ['parameter', '$scope', '$controller', 'parameterService'];
module.exports = FormNewParameterController;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/270ffb7f/traffic_ops/experimental/ui/app/src/common/modules/form/profile/new/FormNewProfileController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/profile/new/FormNewProfileController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/profile/new/FormNewProfileController.js
index a155fe0..d2362e9 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/profile/new/FormNewProfileController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/profile/new/FormNewProfileController.js
@@ -1,4 +1,4 @@
-var FormNewProfileController = function(profile, $scope, $controller, locationUtils, profileService) {
+var FormNewProfileController = function(profile, $scope, $controller, profileService) {
// extends the FormProfileController to inherit common methods
angular.extend(this, $controller('FormProfileController', { profile: profile, $scope: $scope }));
@@ -11,13 +11,10 @@ var FormNewProfileController = function(profile, $scope, $controller, locationUt
};
$scope.save = function(profile) {
- profileService.createProfile(profile).
- then(function() {
- locationUtils.navigateToPath('/admin/profiles');
- });
+ profileService.createProfile(profile);
};
};
-FormNewProfileController.$inject = ['profile', '$scope', '$controller', 'locationUtils', 'profileService'];
+FormNewProfileController.$inject = ['profile', '$scope', '$controller', 'profileService'];
module.exports = FormNewProfileController;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/270ffb7f/traffic_ops/experimental/ui/app/src/common/modules/form/server/new/FormNewServerController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/server/new/FormNewServerController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/server/new/FormNewServerController.js
index d1cb7e0..65c9d95 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/server/new/FormNewServerController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/server/new/FormNewServerController.js
@@ -1,4 +1,4 @@
-var FormNewServerController = function(server, $scope, $controller, locationUtils, serverService) {
+var FormNewServerController = function(server, $scope, $controller, serverService) {
// extends the FormServerController to inherit common methods
angular.extend(this, $controller('FormServerController', { server: server, $scope: $scope }));
@@ -11,13 +11,10 @@ var FormNewServerController = function(server, $scope, $controller, locationUtil
};
$scope.save = function(server) {
- serverService.createServer(server).
- then(function() {
- locationUtils.navigateToPath('/configure/servers');
- });
+ serverService.createServer(server);
};
};
-FormNewServerController.$inject = ['server', '$scope', '$controller', 'locationUtils', 'serverService'];
+FormNewServerController.$inject = ['server', '$scope', '$controller', 'serverService'];
module.exports = FormNewServerController;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/270ffb7f/traffic_ops/experimental/ui/app/src/common/modules/form/status/new/FormNewStatusController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/status/new/FormNewStatusController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/status/new/FormNewStatusController.js
index a1e677f..1072854 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/status/new/FormNewStatusController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/status/new/FormNewStatusController.js
@@ -1,4 +1,4 @@
-var FormNewStatusController = function(status, $scope, $controller, locationUtils, statusService) {
+var FormNewStatusController = function(status, $scope, $controller, statusService) {
// extends the FormStatusController to inherit common methods
angular.extend(this, $controller('FormStatusController', { status: status, $scope: $scope }));
@@ -11,13 +11,10 @@ var FormNewStatusController = function(status, $scope, $controller, locationUtil
};
$scope.save = function(status) {
- statusService.createStatus(status).
- then(function() {
- locationUtils.navigateToPath('/admin/statuses');
- });
+ statusService.createStatus(status);
};
};
-FormNewStatusController.$inject = ['status', '$scope', '$controller', 'locationUtils', 'statusService'];
+FormNewStatusController.$inject = ['status', '$scope', '$controller', 'statusService'];
module.exports = FormNewStatusController;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/270ffb7f/traffic_ops/experimental/ui/app/src/common/modules/form/type/new/FormNewTypeController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/type/new/FormNewTypeController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/type/new/FormNewTypeController.js
index e82e028..109f8f7 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/type/new/FormNewTypeController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/type/new/FormNewTypeController.js
@@ -1,4 +1,4 @@
-var FormNewTypeController = function(type, $scope, $controller, locationUtils, typeService) {
+var FormNewTypeController = function(type, $scope, $controller, typeService) {
// extends the FormTypeController to inherit common methods
angular.extend(this, $controller('FormTypeController', { type: type, $scope: $scope }));
@@ -11,13 +11,10 @@ var FormNewTypeController = function(type, $scope, $controller, locationUtils, t
};
$scope.save = function(type) {
- typeService.createType(type).
- then(function() {
- locationUtils.navigateToPath('/admin/types');
- });
+ typeService.createType(type);
};
};
-FormNewTypeController.$inject = ['type', '$scope', '$controller', 'locationUtils', 'typeService'];
+FormNewTypeController.$inject = ['type', '$scope', '$controller', 'typeService'];
module.exports = FormNewTypeController;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/270ffb7f/traffic_ops/experimental/ui/app/src/common/modules/form/user/new/FormNewUserController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/modules/form/user/new/FormNewUserController.js b/traffic_ops/experimental/ui/app/src/common/modules/form/user/new/FormNewUserController.js
index 586ecab..9d6ea48 100644
--- a/traffic_ops/experimental/ui/app/src/common/modules/form/user/new/FormNewUserController.js
+++ b/traffic_ops/experimental/ui/app/src/common/modules/form/user/new/FormNewUserController.js
@@ -1,4 +1,4 @@
-var FormNewUserController = function(user, $scope, $controller, locationUtils, userService) {
+var FormNewUserController = function(user, $scope, $controller, userService) {
// extends the FormUserController to inherit common methods
angular.extend(this, $controller('FormUserController', { user: user, $scope: $scope }));
@@ -11,13 +11,10 @@ var FormNewUserController = function(user, $scope, $controller, locationUtils, u
};
$scope.confirmSave = function(user, usernameField) {
- userService.createUser(user).
- then(function() {
- locationUtils.navigateToPath('/admin/users');
- });
+ userService.createUser(user);
};
};
-FormNewUserController.$inject = ['user', '$scope', '$controller', 'locationUtils', 'userService'];
+FormNewUserController.$inject = ['user', '$scope', '$controller', 'userService'];
module.exports = FormNewUserController;
\ No newline at end of file