You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2016/11/17 01:31:18 UTC
[1/2] incubator-trafficcontrol git commit: handles change of dsid in
api from string to int
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/psql-rebase e919e288a -> 7978fc78d
handles change of dsid in api from string to int
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/0a4d243a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/0a4d243a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/0a4d243a
Branch: refs/heads/psql-rebase
Commit: 0a4d243a8a9040d1f359b0b7934f51ca04aac515
Parents: e919e28
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Wed Nov 16 15:17:56 2016 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Wed Nov 16 18:30:17 2016 -0700
----------------------------------------------------------------------
traffic_portal/app/src/common/models/DeliveryServicesModel.js | 6 +++---
.../deliveryServices/DashboardDeliveryServicesController.js | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/0a4d243a/traffic_portal/app/src/common/models/DeliveryServicesModel.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/common/models/DeliveryServicesModel.js b/traffic_portal/app/src/common/models/DeliveryServicesModel.js
index 8665e2b..260541f 100644
--- a/traffic_portal/app/src/common/models/DeliveryServicesModel.js
+++ b/traffic_portal/app/src/common/models/DeliveryServicesModel.js
@@ -15,7 +15,7 @@
*/
-var DeliveryServicesModel = function($location) {
+var DeliveryServicesModel = function() {
var model = this;
@@ -26,7 +26,7 @@ var DeliveryServicesModel = function($location) {
this.loaded = loaded;
this.getDeliveryService = function(dsId) {
- return _.find(model.deliveryServices, function(ds){ return ds.id === dsId });
+ return _.find(model.deliveryServices, function(ds){ return parseInt(ds.id) == parseInt(dsId) });
};
this.setDeliveryServices = function(deliveryServicesData) {
@@ -41,5 +41,5 @@ var DeliveryServicesModel = function($location) {
};
-DeliveryServicesModel.$inject = ['$location'];
+DeliveryServicesModel.$inject = [];
module.exports = DeliveryServicesModel;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/0a4d243a/traffic_portal/app/src/modules/private/dashboard/overview/deliveryServices/DashboardDeliveryServicesController.js
----------------------------------------------------------------------
diff --git a/traffic_portal/app/src/modules/private/dashboard/overview/deliveryServices/DashboardDeliveryServicesController.js b/traffic_portal/app/src/modules/private/dashboard/overview/deliveryServices/DashboardDeliveryServicesController.js
index f7bf9a4..619b8ef 100644
--- a/traffic_portal/app/src/modules/private/dashboard/overview/deliveryServices/DashboardDeliveryServicesController.js
+++ b/traffic_portal/app/src/modules/private/dashboard/overview/deliveryServices/DashboardDeliveryServicesController.js
@@ -159,7 +159,7 @@ var DashboardDeliveryServicesController = function($window, $rootScope, $scope,
$scope.hideDeliveryService = function(ds) {
var query = $scope.search.query.toLowerCase(),
- id = ds.id,
+ id = ds.id.toString(),
xmlId = ds.xmlId.toLowerCase(),
displayName = ds.displayName.toLowerCase(),
isSubstring = (id.indexOf(query) !== -1) || (xmlId.indexOf(query) !== -1) || (displayName.indexOf(query) !== -1);
[2/2] incubator-trafficcontrol git commit: This closes #89.
Posted by da...@apache.org.
This closes #89.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/7978fc78
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/7978fc78
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/7978fc78
Branch: refs/heads/psql-rebase
Commit: 7978fc78db21175b16b1b425a3df248783c02933
Parents: 0a4d243
Author: Dan Kirkwood <da...@gmail.com>
Authored: Wed Nov 16 18:30:59 2016 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Wed Nov 16 18:30:59 2016 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------