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/06/22 20:20:58 UTC
[05/17] incubator-trafficcontrol git commit: allow for n number of
targets
allow for n number of targets
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/237a4e6a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/237a4e6a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/237a4e6a
Branch: refs/heads/master
Commit: 237a4e6aac73689a850d9799635044e42642793f
Parents: d13f504
Author: Derek Gelinas <de...@cable.comcast.com>
Authored: Thu Apr 13 10:15:53 2017 -0400
Committer: Jeff Elsloo <je...@cable.comcast.com>
Committed: Thu Jun 22 14:18:17 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/lib/UI/Steering.pm | 24 ++++++++-----
.../app/templates/steering/index.html.ep | 36 ++++++++++----------
2 files changed, 34 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/237a4e6a/traffic_ops/app/lib/UI/Steering.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Steering.pm b/traffic_ops/app/lib/UI/Steering.pm
index 0d7004d..0a6a7bd 100644
--- a/traffic_ops/app/lib/UI/Steering.pm
+++ b/traffic_ops/app/lib/UI/Steering.pm
@@ -26,6 +26,7 @@ use Scalar::Util qw(looks_like_number);
use JSON;
use POSIX qw(strftime);
use Date::Parse;
+use Data::Dumper;
sub index {
my $self = shift;
@@ -41,16 +42,23 @@ sub index {
while ( my $row = $st_rs->next ) {
$steering_targets{ $row->target } = $row->weight;
}
+ my $i = 0;
my @keys = sort keys %steering_targets;
- $steering->{'target_id_1'} = $keys[0];
- $steering->{'target_id_2'} = $keys[1];
- $steering->{'target_name_1'} = $self->get_ds_name( $keys[0] );
- $steering->{'target_name_2'} = $self->get_ds_name( $keys[1] );
- $steering->{'target_id_1_weight'} = $self->get_target_weight( $ds_id, $keys[0] );
- $steering->{'target_id_2_weight'} = $self->get_target_weight( $ds_id, $keys[1] );
+ while ( (my $target, my $weight) = each %steering_targets ) {
+ $steering->{"target_id_$i"} = $target;
+ $steering->{"target_name_$i"} = $self->get_ds_name( $target );
+ $steering->{"target_weight_id_$i"} = $weight;
+ if (!defined($steering->{"target_weight_id_$i"})) { $steering->{"target_weight_id_$i"} = 0; }
+ $i++;
+ }
}
- if (!defined($steering->{'target_id_1_weight'})) { $steering->{'target_id_1_weight'} = 0; }
- if (!defined($steering->{'target_id_2_weight'})) { $steering->{'target_id_2_weight'} = 0; }
+ print STDERR Dumper($steering->{'target_id_0'});
+ print STDERR Dumper($steering->{'target_name_0'});
+ print STDERR Dumper($steering->{'target_weight_id_0'});
+ print STDERR Dumper($steering->{'target_id_1'});
+ print STDERR Dumper($steering->{'target_name_1'});
+ print STDERR Dumper($steering->{'target_weight_id_1'});
+
$self->stash(
steering => $steering,
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/237a4e6a/traffic_ops/app/templates/steering/index.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/steering/index.html.ep b/traffic_ops/app/templates/steering/index.html.ep
index 2b7a0d1..3284924 100644
--- a/traffic_ops/app/templates/steering/index.html.ep
+++ b/traffic_ops/app/templates/steering/index.html.ep
@@ -39,13 +39,13 @@
%= field('steering.ds_name')->text(class => 'readonly_field', id => 'ds_name', name => 'steering.ds_name', readonly => 'readonly');
</div><br><br>
<div>
- <% unless (field('steering.target_id_1')->valid) { %>
- <span class="field-with-error"><%= field('steering.target_id_1')->error %></span><br>
+ <% unless (field('steering.target_id_0')->valid) { %>
+ <span class="field-with-error"><%= field('steering.target_id_0')->error %></span><br>
<% } %>
- %= label_for 'steering.target_name_1' => 'Target Name:', class => 'label', style=>"width:150px;"
- <select style="max-width:250px" name="steering.target_id_1">
- <% if (defined($steering->{target_id_1})) { %>
- <option value="<%=$steering->{target_id_1}%>" selected><%=$steering->{target_name_1}%></option>
+ %= label_for 'steering.target_name_0' => 'Target Name:', class => 'label', style=>"width:150px;"
+ <select style="max-width:250px" name="steering.target_id_0">
+ <% if (defined($steering->{target_id_0})) { %>
+ <option value="<%=$steering->{target_id_0}%>" selected><%=$steering->{target_name_0}%></option>
<% } else { %>
<option value="" selected></option>
<% } %>
@@ -55,18 +55,18 @@
</select>
</div><br>
<div>
- <% unless (field('steering.target_id_1_weight')->valid) { %>
- <span class="field-with-error"><%= field('steering.target_id_1_weight')->error %></span><br><br>
+ <% unless (field('steering.target_weight_id_0')->valid) { %>
+ <span class="field-with-error"><%= field('steering.target_weight_id_0')->error %></span><br><br>
<% } %>
- %= label_for 'steering.target_id_1_weight' => 'Target Weight (0 is default): ', class => 'label'
- %= field('steering.target_id_1_weight')->text(class => 'field', id => 'steering.target_id_1_weight', style => 'width:60px', name => 'steering.target_id_1_weight');
+ %= label_for 'steering.target_weight_id_0' => 'Target Weight (0 is default): ', class => 'label'
+ %= field('steering.target_weight_id_0')->text(class => 'field', id => 'steering.target_weight_id_0', style => 'width:60px', name => 'steering.target_weight_id_0');
</div><br>
</div>
<div>
- %= label_for 'steering.target_name_2' => 'Target Name:', class => 'label', style=>"width:150px;"
- <select style="max-width:250px" name="steering.target_id_2">
- <% if (defined($steering->{target_id_2})) { %>
- <option value="<%=$steering->{target_id_2}%>" selected><%=$steering->{target_name_2}%></option>
+ %= label_for 'steering.target_name_1' => 'Target Name:', class => 'label', style=>"width:150px;"
+ <select style="max-width:250px" name="steering.target_id_1">
+ <% if (defined($steering->{target_id_1})) { %>
+ <option value="<%=$steering->{target_id_1}%>" selected><%=$steering->{target_name_1}%></option>
<% } else { %>
<option value="" selected></option>
<% } %>
@@ -76,11 +76,11 @@
</select>
</div><br>
<div>
- <% unless (field('steering.target_id_2_weight')->valid) { %>
- <span class="field-with-error"><%= field('steering.target_id_2_weight')->error %></span><br><br>
+ <% unless (field('steering.target_weight_id_1')->valid) { %>
+ <span class="field-with-error"><%= field('steering.target_weight_id_1')->error %></span><br><br>
<% } %>
- %= label_for 'steering.target_id_2_weight' => 'Target Weight (0 is default): ', class => 'label'
- %= field('steering.target_id_2_weight')->text(class => 'field', id => 'steering.target_id_2_weight', style => 'width:60px', name => 'steering.target_id_2_weight');
+ %= label_for 'steering.target_weight_id_1' => 'Target Weight (0 is default): ', class => 'label'
+ %= field('steering.target_weight_id_1')->text(class => 'field', id => 'steering.target_weight_id_1', style => 'width:60px', name => 'steering.target_weight_id_1');
</div><br>
<div class="buttons-section" style="margin-bottom: 20px;">
<div style="margin-top: 25px; margin-left: 10px; position: relative; display: inline-block; float: left;">