dangogh closed pull request #2268: adds ?orderby=name when fetching cache groups
URL: https://github.com/apache/incubator-trafficcontrol/pull/2268
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/traffic_portal/app/src/common/modules/form/asn/FormASNController.js
b/traffic_portal/app/src/common/modules/form/asn/FormASNController.js
index 85f14759b..31bd29503 100644
--- a/traffic_portal/app/src/common/modules/form/asn/FormASNController.js
+++ b/traffic_portal/app/src/common/modules/form/asn/FormASNController.js
@@ -20,7 +20,7 @@
var FormASNController = function(asn, $scope, formUtils, locationUtils,
cacheGroupService) {
var getCacheGroups = function() {
- cacheGroupService.getCacheGroups()
+ cacheGroupService.getCacheGroups({ orderby: 'name' })
.then(function(result) {
$scope.cachegroups = result;
});
diff --git
a/traffic_portal/app/src/common/modules/form/cacheGroup/FormCacheGroupController.js
b/traffic_portal/app/src/common/modules/form/cacheGroup/FormCacheGroupController.js
index 5eb334dd3..f53c28a27 100644
---
a/traffic_portal/app/src/common/modules/form/cacheGroup/FormCacheGroupController.js
+++
b/traffic_portal/app/src/common/modules/form/cacheGroup/FormCacheGroupController.js
@@ -20,7 +20,7 @@
var FormCacheGroupController = function(cacheGroup, $scope, $location,
formUtils, locationUtils, cacheGroupService, typeService) {
var getCacheGroups = function() {
- cacheGroupService.getCacheGroups()
+ cacheGroupService.getCacheGroups({ orderby: 'name' })
.then(function(result) {
$scope.cacheGroups = result;
});
diff --git
a/traffic_portal/app/src/common/modules/form/server/FormServerController.js
b/traffic_portal/app/src/common/modules/form/server/FormServerController.js
index 53e774534..2f469312b 100644
--- a/traffic_portal/app/src/common/modules/form/server/FormServerController.js
+++ b/traffic_portal/app/src/common/modules/form/server/FormServerController.js
@@ -27,7 +27,7 @@ var FormServerController = function(server, $scope,
$location, $state, $uibModal
};
var getCacheGroups = function() {
- cacheGroupService.getCacheGroups()
+ cacheGroupService.getCacheGroups({ orderby: 'name' })
.then(function(result) {
$scope.cacheGroups = result;
});
diff --git a/traffic_portal/app/src/modules/private/cacheGroups/list/index.js
b/traffic_portal/app/src/modules/private/cacheGroups/list/index.js
index 2a15b3980..2a275ec20 100644
--- a/traffic_portal/app/src/modules/private/cacheGroups/list/index.js
+++ b/traffic_portal/app/src/modules/private/cacheGroups/list/index.js
@@ -28,7 +28,7 @@ module.exports =
angular.module('trafficPortal.private.cacheGroups.list', [])
controller: 'TableCacheGroupsController',
resolve: {
cacheGroups: function(cacheGroupService) {
- return cacheGroupService.getCacheGroups();
+ return cacheGroupService.getCacheGroups({
orderby: 'name' });
}
}
}
diff --git a/traffic_portal/app/src/modules/private/types/cacheGroups/index.js
b/traffic_portal/app/src/modules/private/types/cacheGroups/index.js
index d2fa83ae9..3224deca9 100644
--- a/traffic_portal/app/src/modules/private/types/cacheGroups/index.js
+++ b/traffic_portal/app/src/modules/private/types/cacheGroups/index.js
@@ -31,7 +31,7 @@ module.exports =
angular.module('trafficPortal.private.types.cacheGroups', [])
return
typeService.getType($stateParams.typeId);
},
cacheGroups:
function($stateParams, cacheGroupService) {
- return
cacheGroupService.getCacheGroups({ type: $stateParams.typeId });
+ return
cacheGroupService.getCacheGroups({ type: $stateParams.typeId, orderby: 'name'
});
}
}
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
