Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added description and priority order for Layered Profile in server's form. #7295

Merged
merged 2 commits into from
Jan 23, 2023
Merged

Added description and priority order for Layered Profile in server's form. #7295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77f28a9
Added description and priority order for LP in server's form.
rimashah25 Jan 18, 2023
b92e0b3
review feedback.
rimashah25 Jan 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).

## [unreleased]
### Added
- [#7295](https://github.com/apache/trafficcontrol/pull/7295) *Traffic Portal* Added description and priority order for Layered Profile on server form.
- [#6234](https://github.com/apache/trafficcontrol/issues/6234) *Traffic Ops, Traffic Portal* Added description field to Server Capabilities
- [#6033](https://github.com/apache/trafficcontrol/issues/6033) *Traffic Ops, Traffic Portal* Added ability to assign multiple servers per capability.
- [#7081](https://github.com/apache/trafficcontrol/issues/7081) *Traffic Router* Added better log messages for TR connection exceptions.
Expand Down
12 changes: 10 additions & 2 deletions traffic_portal/app/src/common/modules/form/server/form.server.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,16 @@
</div>

<fieldset>
<legend>Profiles<button name="addProfileBtn" class="btn btn-primary right-button btn-xs" type="button" title="add a new profile to the server" ng-click="addProfile()"><i class="fa fa-plus"></i></button></legend>
<fieldset ng-repeat="profile in server.profileNames track by $index">
<legend title="Layered Profiles for a given server."> Profiles
<button name="addProfileBtn" class="btn btn-primary right-button btn-xs" type="button" title="add new profile(s) to the server" ng-click="addProfile()"><i class="fa fa-plus"></i></button>
</legend>
<p>
<b>Note:</b> The profile with the highest priority (<b>1 - highest</b>), will take precedence (in terms of parameters).
<br>
For example, P1 and P2 are two profiles associated with a server, S1. Parameters of P1 will have a <u>higher</u> priority over that of P2.
And if there exists parameters with same name but different values, then P1's parameters will <b>not</b> be overwritten.
</p>
<fieldset ng-repeat="profile in server.profileNames track by $index"> {{$index + 1}}
<select ng-class="{'has-error': hasPropertyError(serverForm['activeProfile-'+$index], 'required'), 'has-feedback': hasPropertyError(serverForm['activeProfile-'+$index], 'required')}"
id="activeProfile-{{$index}}" name="activeProfile-{{$index}}" class="form-control" ng-model="server.profileNames[$index]"
ng-options="profile.name as profile.name for profile in profiles|excludeFilter:profile:server.profileNames" required>
Expand Down