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/26 15:02:22 UTC
[1/2] incubator-trafficcontrol git commit: Fixed profile export,
import and edit functions in traffic ops gui
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master dfdfdcabd -> 2eb067460
Fixed profile export, import and edit functions in traffic ops gui
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/d3e672d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/d3e672d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/d3e672d7
Branch: refs/heads/master
Commit: d3e672d7638e939dedd073feb2365cc2f119dea7
Parents: dfdfdca
Author: Robert Scrimo <ro...@comcast.com>
Authored: Tue Apr 25 17:48:11 2017 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Wed Apr 26 09:01:53 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/lib/UI/Profile.pm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/d3e672d7/traffic_ops/app/lib/UI/Profile.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Profile.pm b/traffic_ops/app/lib/UI/Profile.pm
index e035255..f6442a7 100644
--- a/traffic_ops/app/lib/UI/Profile.pm
+++ b/traffic_ops/app/lib/UI/Profile.pm
@@ -48,7 +48,7 @@ sub edit {
my $cursor = $self->db->resultset('Profile')->search( { id => $id } );
my $data = $cursor->single;
- $self->stash_cdn_selector($data->cdn->id);
+ $self->stash_cdn_selector(defined($data->cdn) ? $data->cdn->id : undef);
$self->stash_profile_type_selector($data->type);
&stash_role($self);
@@ -147,6 +147,7 @@ sub check_profile_input {
#Check required fields
$self->field('profile.name')->is_required;
$self->field('profile.description')->is_required;
+ $self->field('profile.type')->is_required;
$self->field('profile.name')->is_like( qr/^\S+$/, "Profile name cannot contain space(s)." );
@@ -292,8 +293,10 @@ sub doImport {
my $data = JSON->new->utf8->decode( $in_data->asset->{content} );
my $p_name = $data->{profile}->{name};
my $p_desc = $data->{profile}->{description};
+ my $p_type = $data->{profile}->{type};
my $existing_profile = $self->db->resultset('Profile')->search( { name => $p_name } )->get_column('name')->single();
my $existing_desc = $self->db->resultset('Profile')->search( { description => $p_desc } )->get_column('description')->single();
+ my @valid_types = @{$self->db->source('ProfileTypeValue')->column_info('value')->{extra}->{list}};
my @msgs;
if ($existing_profile) {
@@ -302,6 +305,12 @@ sub doImport {
if ($existing_desc) {
push( @msgs, "A profile with the exact same description already exists!" );
}
+
+ if (! grep(/^$p_type$/, @valid_types )) {
+ my $vtypes = join(', ', @valid_types);
+ push( @msgs, "Profile contains type \"$p_type\" which is not a valid profile type. Valid types are: $vtypes" );
+ }
+
my $msgs_size = @msgs;
if ( $msgs_size > 0 ) {
&stash_role($self);
@@ -313,6 +322,7 @@ sub doImport {
{
name => $p_name,
description => $p_desc,
+ type => $p_type,
}
);
$insert->insert();
@@ -397,6 +407,7 @@ sub export {
if ( !defined( $jdata->{profile} ) ) {
$jdata->{profile}->{name} = $row->profile->name;
$jdata->{profile}->{description} = $row->profile->description;
+ $jdata->{profile}->{type} = $row->profile->type;
$pname = $row->profile->name;
}
$jdata->{parameters}->[$i] = {
[2/2] incubator-trafficcontrol git commit: This closes #519
Posted by mi...@apache.org.
This closes #519
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/2eb06746
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/2eb06746
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/2eb06746
Branch: refs/heads/master
Commit: 2eb06746060b4ee71c182100b414b668077c0654
Parents: d3e672d
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Wed Apr 26 09:02:11 2017 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Wed Apr 26 09:02:11 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------