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 2017/04/21 00:05:07 UTC
[1/2] incubator-trafficcontrol git commit: fix an issue where when
read only users try to access a DS they get an error
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master 8d9329c1c -> a62b5f9f7
fix an issue where when read only users try to access a DS they get an error
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/fe4d9807
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/fe4d9807
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/fe4d9807
Branch: refs/heads/master
Commit: fe4d9807137c2f34cbf4dadd45e7cf4a664f1163
Parents: 8d9329c
Author: David Neuman <da...@gmail.com>
Authored: Thu Apr 20 16:25:47 2017 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Thu Apr 20 18:04:30 2017 -0600
----------------------------------------------------------------------
.../app/templates/delivery_service/_form.html.ep | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/fe4d9807/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 05f871b..88d42fd 100644
--- a/traffic_ops/app/templates/delivery_service/_form.html.ep
+++ b/traffic_ops/app/templates/delivery_service/_form.html.ep
@@ -26,7 +26,7 @@
%= label_for 'xml_id' => '* XML ID', class => 'label'
<% if ($priv_level >= 20) { %>
%= field('ds.xml_id')->text(class => 'field', required => 'required', name => 'ds.xml_id', id => 'ds.xml_id')
- <% } else { %>
+ <% } else { %>
%= field('ds.xml_id')->text(class => 'field', readonly => 'readonly')
<% } %>
</div>
@@ -37,7 +37,7 @@
%= label_for 'display_name' => '* Display Name', class => 'label'
<% if ($priv_level >= 20) { %>
%= field('ds.display_name')->text(class => 'field', required => 'required', name => 'ds.display_name', id => 'ds.display_name')
- <% } else { %>
+ <% } else { %>
%= field('ds.display_name')->text(class => 'field', readonly => 'readonly')
<% } %>
</div>
@@ -60,9 +60,9 @@
<% if ($mode =~ /edit/) { %>
%= field('ds.type.name')->text(class => 'field', required => 'required', id => 'type', name => 'ds.type', readonly => 'readonly');
%= field('ds.type.id')->hidden(class => 'field', required => 'required', id => 'ds.type.id', name => 'ds.type.id', type => 'hidden');
- <% } else { %>
+ <% } else { %>
%= field('ds.type')->select(class => 'field', required => 'required', id => 'type', name => 'ds.type');
- <% } %>
+ <% } %>
</div>
<div class="block form-row" id="protocoli_row">
<% unless (field('ds.protocol')->valid) { %>
@@ -127,7 +127,7 @@
%= field('ds.dscp')->text(class => 'field', value => '48 - CS6', readonly => 'readonly');
<% } elsif ($ds->dscp == 45) {%>
%= field('ds.dscp')->text(class => 'field', value => '56 - CS7', readonly => 'readonly');
- <% }
+ <% }
<% } %>
</div>
<div class="block form-row" id="signed_row">
@@ -320,7 +320,7 @@
<% } %>
%= label_for 'max_dns_answers' => 'Maximum IP addresses in DNS answer (0 means all)', class => 'label'
<% if ($priv_level >= 20) { %>
- <% if ($mode =~ /edit/) { %>
+ <% if ($mode =~ /edit/) { %>
%= field('ds.max_dns_answers')->text(class => 'field', id => 'max_dns_answers', name => 'ds.max_dns_answers');
<% } else { %>
%= field('ds.max_dns_answers')->text(class => 'field', id => 'max_dns_answers', name => 'ds.max_dns_answers', default => 0);
@@ -374,7 +374,7 @@
<% if ($priv_level >= 20) { %>
%= field('ds.profile')->select( \@{$profiles} );
<% } else { %>
- %= field('ds.profile.name')->text(class => 'field', readonly => 'readonly');
+ %= field('ds.profile')->text(class => 'field', readonly => 'readonly');
<% } %>
</div>
<div class="block form-row" id="global_max_mbps_row">
[2/2] incubator-trafficcontrol git commit: This closes #496
Posted by mi...@apache.org.
This closes #496
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/a62b5f9f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/a62b5f9f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/a62b5f9f
Branch: refs/heads/master
Commit: a62b5f9f7a9c92ac8431a7c2a23a4ca943cfe2ef
Parents: fe4d980
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Thu Apr 20 18:04:56 2017 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Thu Apr 20 18:04:56 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------