You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by fr...@apache.org on 2017/03/15 15:15:51 UTC

[1/2] incubator-trafficcontrol git commit: name is not a column on the ds table. display_name is however.

Repository: incubator-trafficcontrol
Updated Branches:
  refs/heads/2.0.x 8c841f1d7 -> 840793a38


name is not a column on the ds table. display_name is however.

(cherry picked from commit 6685b67d373562849e94cda3ee5c4ca630ee57fb)


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/c0b6833e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/c0b6833e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/c0b6833e

Branch: refs/heads/2.0.x
Commit: c0b6833ed7b8fa2604b8ade92b33858b6a457e37
Parents: 8c841f1
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Tue Mar 14 15:16:55 2017 -0600
Committer: Eric Friedrich <fr...@apache.org>
Committed: Wed Mar 15 11:15:25 2017 -0400

----------------------------------------------------------------------
 .../app/templates/federation/_listdeliveryservices.js.html.ep      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c0b6833e/traffic_ops/app/templates/federation/_listdeliveryservices.js.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/federation/_listdeliveryservices.js.html.ep b/traffic_ops/app/templates/federation/_listdeliveryservices.js.html.ep
index 4f3f936..6747e06 100644
--- a/traffic_ops/app/templates/federation/_listdeliveryservices.js.html.ep
+++ b/traffic_ops/app/templates/federation/_listdeliveryservices.js.html.ep
@@ -15,7 +15,7 @@
 
 function listDeliveryServices(selected_ds_id) {
 	$("#delivery_service").html("<select id=\"dsselect\" name=\"ds_id\"></select>");	
-	$.get("/api/1.2/deliveryservices.json?orderby=name", function(data){
+	$.get("/api/1.2/deliveryservices.json?orderby=display_name", function(data){
 		var response = data['response'];
 		$.each(response, function(idx, val) {
 			if (response[idx].id == selected_ds_id) {


[2/2] incubator-trafficcontrol git commit: This closes #368

Posted by fr...@apache.org.
This closes #368


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/840793a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/840793a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/840793a3

Branch: refs/heads/2.0.x
Commit: 840793a38f0c1b6fcc4037bf32d3eb23bf53bd18
Parents: c0b6833
Author: Eric Friedrich <fr...@apache.org>
Authored: Wed Mar 15 11:15:35 2017 -0400
Committer: Eric Friedrich <fr...@apache.org>
Committed: Wed Mar 15 11:15:35 2017 -0400

----------------------------------------------------------------------

----------------------------------------------------------------------