You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by el...@apache.org on 2017/05/24 19:15:58 UTC
[1/2] incubator-trafficcontrol git commit: The CCR DNS TTL field is
now visible and editable in the UI
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master 95c1f3804 -> cee7b63d5
The CCR DNS TTL field is now visible and editable in the UI
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/85c6f18f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/85c6f18f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/85c6f18f
Branch: refs/heads/master
Commit: 85c6f18fe412387031aed9ab64971e3704c1a5b4
Parents: 95c1f38
Author: David Neuman <da...@gmail.com>
Authored: Wed May 24 13:05:38 2017 -0600
Committer: Jeff Elsloo <je...@cable.comcast.com>
Committed: Wed May 24 13:15:35 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/templates/delivery_service/_form.html.ep | 2 +-
traffic_ops/app/templates/delivery_service/add.html.ep | 8 ++++----
traffic_ops/app/templates/delivery_service/edit.html.ep | 10 ++++------
3 files changed, 9 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/85c6f18f/traffic_ops/app/templates/delivery_service/_form.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/delivery_service/_form.html.ep b/traffic_ops/app/templates/delivery_service/_form.html.ep
index 88d42fd..3c4db22 100644
--- a/traffic_ops/app/templates/delivery_service/_form.html.ep
+++ b/traffic_ops/app/templates/delivery_service/_form.html.ep
@@ -335,7 +335,7 @@
<% } %>
%= label_for 'ccr_dns_ttl' => 'Delivery Service DNS TTL', class => 'label'
<% if ($priv_level >= 20) { %>
- %= field('ds.ccr_dns_ttl')->text(class => 'field', id => 'ccr_dns_ttl', name => 'ds.ccr_dns_ttl', value => 3600);
+ %= field('ds.ccr_dns_ttl')->text(class => 'field', id => 'ccr_dns_ttl', name => 'ds.ccr_dns_ttl');
<% } else { %>
%= field('ds.ccr_dns_ttl')->text(class => 'field', readonly => 'readonly');
<% } %>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/85c6f18f/traffic_ops/app/templates/delivery_service/add.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/delivery_service/add.html.ep b/traffic_ops/app/templates/delivery_service/add.html.ep
index 3f883c6..c3fbd55 100644
--- a/traffic_ops/app/templates/delivery_service/add.html.ep
+++ b/traffic_ops/app/templates/delivery_service/add.html.ep
@@ -104,6 +104,7 @@
$("#regexp_selector :nth-child(3)").removeAttr('disabled');
$("#regexp_selector :nth-child(4)").removeAttr('disabled');
$('#ccr_dns_ttl').val(3600);
+ $('#ccr_dns_ttl_row').show(speed);
$('#protocoli_row').show(speed);
$('#dscp_row').show(speed);
$('#signed_row').show(speed);
@@ -118,7 +119,6 @@
$('#dns_bypass_cname_row').hide(speed);
$('#dns_bypass_ttl_row').show(speed);
$('#max_dns_answers_row').hide(speed);
- $('#ccr_dns_ttl_row').hide(speed);
$('#org_server_fqdn_row').show(speed);
$('#global_max_mbps_row').show(speed);
$('#global_max_tps_row').show(speed);
@@ -146,6 +146,7 @@
$("#regexp_selector :nth-child(3)").attr('disabled','disabled');
$("#regexp_selector :nth-child(4)").attr('disabled','disabled');
$('#ccr_dns_ttl').val(30);
+ $('#ccr_dns_ttl_row').show(speed);
$('#protocoli_row').show(speed);
$('#dscp_row').show(speed);
$('#signed_row').show(speed);
@@ -160,7 +161,6 @@
$('#dns_bypass_cname_row').show(speed);
$('#dns_bypass_ttl_row').show(speed);
$('#max_dns_answers_row').show(speed);
- $('#ccr_dns_ttl_row').hide(speed);
$('#org_server_fqdn_row').show(speed);
$('#global_max_mbps_row').show(speed);
$('#global_max_tps_row').show(speed);
@@ -198,7 +198,7 @@
$('#regional_geo_blocking_row').show(speed);
$('#dns_bypass_ttl_row').hide(speed);
$('#max_dns_answers_row').hide(speed);
- $('#ccr_dns_ttl_row').hide(speed);
+ $('#ccr_dns_ttl_row').show(speed);
$('#org_server_fqdn_row').hide(speed);
$('#global_max_mbps_row').hide(speed);
$('#global_max_tps_row').hide(speed);
@@ -236,7 +236,7 @@
$('#dns_bypass_cname_row').hide(speed);
$('#dns_bypass_ttl_row').hide(speed);
$('#max_dns_answers_row').hide(speed);
- $('#ccr_dns_ttl_row').hide(speed);
+ $('#ccr_dns_ttl_row').show(speed);
$('#org_server_fqdn_row').hide(speed);
$('#global_max_mbps_row').hide(speed);
$('#global_max_tps_row').hide(speed);
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/85c6f18f/traffic_ops/app/templates/delivery_service/edit.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/delivery_service/edit.html.ep b/traffic_ops/app/templates/delivery_service/edit.html.ep
index 9e95cae..e60b639 100644
--- a/traffic_ops/app/templates/delivery_service/edit.html.ep
+++ b/traffic_ops/app/templates/delivery_service/edit.html.ep
@@ -198,7 +198,7 @@ function setup_form(speed) {
if (type_selected.match(/^HTTP/)) {
$("#regexp_selector :nth-child(3)").removeAttr('disabled');
$("#regexp_selector :nth-child(4)").removeAttr('disabled');
- $('#ccr_dns_ttl').val(3600);
+ $('#ccr_dns_ttl').show(speed);
$('#protocoli_row').show(speed);
$('#dscp_row').show(speed);
$('#signed_row').show(speed);
@@ -213,7 +213,6 @@ function setup_form(speed) {
$('#dns_bypass_cname_row').hide(speed);
$('#dns_bypass_ttl_row').show(speed);
$('#max_dns_answers_row').hide(speed);
- $('#ccr_dns_ttl_row').hide(speed);
$('#org_server_fqdn_row').show(speed);
$('#global_max_mbps_row').show(speed);
$('#global_max_tps_row').show(speed);
@@ -239,7 +238,7 @@ function setup_form(speed) {
else if (type_selected.match(/^DNS/)) {
$("#regexp_selector :nth-child(3)").attr('disabled','disabled');
$("#regexp_selector :nth-child(4)").attr('disabled','disabled');
- $('#ccr_dns_ttl').val(30);
+ $('#ccr_dns_ttl').show(speed);
$('#protocoli_row').show(speed);
$('#dscp_row').show(speed);
$('#signed_row').show(speed);
@@ -254,7 +253,6 @@ function setup_form(speed) {
$('#dns_bypass_cname_row').show(speed);
$('#dns_bypass_ttl_row').show(speed);
$('#max_dns_answers_row').show(speed);
- $('#ccr_dns_ttl_row').hide(speed);
$('#org_server_fqdn_row').show(speed);
$('#global_max_mbps_row').show(speed);
$('#global_max_tps_row').show(speed);
@@ -292,7 +290,7 @@ function setup_form(speed) {
$('#dns_bypass_cname_row').hide(speed);
$('#dns_bypass_ttl_row').hide(speed);
$('#max_dns_answers_row').hide(speed);
- $('#ccr_dns_ttl_row').hide(speed);
+ $('#ccr_dns_ttl_row').show(speed);
$('#org_server_fqdn_row').hide(speed);
$('#global_max_mbps_row').hide(speed);
$('#global_max_tps_row').hide(speed);
@@ -330,7 +328,7 @@ function setup_form(speed) {
$('#dns_bypass_cname_row').hide(speed);
$('#dns_bypass_ttl_row').hide(speed);
$('#max_dns_answers_row').hide(speed);
- $('#ccr_dns_ttl_row').hide(speed);
+ $('#ccr_dns_ttl_row').show(speed);
$('#org_server_fqdn_row').hide(speed);
$('#global_max_mbps_row').hide(speed);
$('#global_max_tps_row').hide(speed);
[2/2] incubator-trafficcontrol git commit: This closes #610.
Posted by el...@apache.org.
This closes #610.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/cee7b63d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/cee7b63d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/cee7b63d
Branch: refs/heads/master
Commit: cee7b63d5a22f087b40c75044bceb029ec98b9f9
Parents: 85c6f18
Author: Jeff Elsloo <je...@cable.comcast.com>
Authored: Wed May 24 13:16:00 2017 -0600
Committer: Jeff Elsloo <je...@cable.comcast.com>
Committed: Wed May 24 13:16:00 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------