You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by de...@apache.org on 2018/07/25 14:57:21 UTC
[trafficcontrol] branch master updated: longdesc1 and 2 are not
required
This is an automated email from the ASF dual-hosted git repository.
dewrich pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 223db37 longdesc1 and 2 are not required
223db37 is described below
commit 223db37c2ce1bbcb2d282f9a1ca3c236574d6c27
Author: Jeremy Mitchell <mi...@gmail.com>
AuthorDate: Wed Jul 25 08:55:03 2018 -0600
longdesc1 and 2 are not required
---
.../modules/form/deliveryService/form.deliveryService.DNS.tpl.html | 7 ++++---
.../form/deliveryService/form.deliveryService.HTTP.tpl.html | 7 ++++---
.../form/deliveryService/form.deliveryService.Steering.tpl.html | 7 ++++---
.../form/deliveryService/form.deliveryService.anyMap.tpl.html | 7 ++++---
4 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html
index 1130984..f01b9d7 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html
@@ -180,7 +180,8 @@ under the License.
<span uib-popover-html="label('longDesc', 'desc')" popover-trigger="click" popover-placement="top" popover-append-to-body="true" popover-class="popover-class">{{label('longDesc', 'title')}}</span> *
</label>
<div class="col-md-10 col-sm-10 col-xs-12">
- <textarea name="longDesc" type="text" class="form-control" ng-model="deliveryService.longDesc" rows="3" autofocus></textarea>
+ <textarea name="longDesc" type="text" class="form-control" ng-model="deliveryService.longDesc" rows="3" required autofocus></textarea>
+ <small class="input-error" ng-show="hasPropertyError(deliveryService.longDesc, 'required')">Required</small>
<small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.longDesc != dsCurrent.longDesc">Current Value: [ {{dsCurrent.longDesc}} ]</small>
<span ng-show="hasError(deliveryServiceForm.longDesc)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
@@ -188,7 +189,7 @@ under the License.
<div class="form-group" ng-class="{'has-error': hasError(deliveryServiceForm.longDesc1), 'has-feedback': hasError(deliveryServiceForm.longDesc1)}">
<label class="control-label col-md-2 col-sm-2 col-xs-12">
- <span uib-popover-html="label('longDesc1', 'desc')" popover-trigger="click" popover-placement="top" popover-append-to-body="true" popover-class="popover-class">{{label('longDesc1', 'title')}}</span> *
+ <span uib-popover-html="label('longDesc1', 'desc')" popover-trigger="click" popover-placement="top" popover-append-to-body="true" popover-class="popover-class">{{label('longDesc1', 'title')}}</span>
</label>
<div class="col-md-10 col-sm-10 col-xs-12">
<textarea name="longDesc1" type="text" class="form-control" ng-model="deliveryService.longDesc1" rows="3" autofocus></textarea>
@@ -199,7 +200,7 @@ under the License.
<div class="form-group" ng-class="{'has-error': hasError(deliveryServiceForm.longDesc2), 'has-feedback': hasError(deliveryServiceForm.longDesc2)}">
<label class="control-label col-md-2 col-sm-2 col-xs-12">
- <span uib-popover-html="label('longDesc2', 'desc')" popover-trigger="click" popover-placement="top" popover-append-to-body="true" popover-class="popover-class">{{label('longDesc2', 'title')}}</span> *
+ <span uib-popover-html="label('longDesc2', 'desc')" popover-trigger="click" popover-placement="top" popover-append-to-body="true" popover-class="popover-class">{{label('longDesc2', 'title')}}</span>
</label>
<div class="col-md-10 col-sm-10 col-xs-12">
<textarea name="longDesc2" type="text" class="form-control" ng-model="deliveryService.longDesc2" rows="3" autofocus></textarea>
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
index b412112..925be25 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
@@ -180,7 +180,8 @@ under the License.
<span uib-popover-html="label('longDesc', 'desc')" popover-trigger="click" popover-placement="top" popover-append-to-body="true" popover-class="popover-class">{{label('longDesc', 'title')}}</span> *
</label>
<div class="col-md-10 col-sm-10 col-xs-12">
- <textarea name="longDesc" type="text" class="form-control" ng-model="deliveryService.longDesc" rows="3" autofocus></textarea>
+ <textarea name="longDesc" type="text" class="form-control" ng-model="deliveryService.longDesc" rows="3" required autofocus></textarea>
+ <small class="input-error" ng-show="hasPropertyError(deliveryService.longDesc, 'required')">Required</small>
<small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.longDesc != dsCurrent.longDesc">Current Value: [ {{dsCurrent.longDesc}} ]</small>
<span ng-show="hasError(deliveryServiceForm.longDesc)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
@@ -188,7 +189,7 @@ under the License.
<div class="form-group" ng-class="{'has-error': hasError(deliveryServiceForm.longDesc1), 'has-feedback': hasError(deliveryServiceForm.longDesc1)}">
<label class="control-label col-md-2 col-sm-2 col-xs-12">
- <span uib-popover-html="label('longDesc1', 'desc')" popover-trigger="click" popover-placement="top" popover-append-to-body="true" popover-class="popover-class">{{label('longDesc1', 'title')}}</span> *
+ <span uib-popover-html="label('longDesc1', 'desc')" popover-trigger="click" popover-placement="top" popover-append-to-body="true" popover-class="popover-class">{{label('longDesc1', 'title')}}</span>
</label>
<div class="col-md-10 col-sm-10 col-xs-12">
<textarea name="longDesc1" type="text" class="form-control" ng-model="deliveryService.longDesc1" rows="3" autofocus></textarea>
@@ -199,7 +200,7 @@ under the License.
<div class="form-group" ng-class="{'has-error': hasError(deliveryServiceForm.longDesc2), 'has-feedback': hasError(deliveryServiceForm.longDesc2)}">
<label class="control-label col-md-2 col-sm-2 col-xs-12">
- <span uib-popover-html="label('longDesc2', 'desc')" popover-trigger="click" popover-placement="top" popover-append-to-body="true" popover-class="popover-class">{{label('longDesc2', 'title')}}</span> *
+ <span uib-popover-html="label('longDesc2', 'desc')" popover-trigger="click" popover-placement="top" popover-append-to-body="true" popover-class="popover-class">{{label('longDesc2', 'title')}}</span>
</label>
<div class="col-md-10 col-sm-10 col-xs-12">
<textarea name="longDesc2" type="text" class="form-control" ng-model="deliveryService.longDesc2" rows="3" autofocus></textarea>
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html
index b42ea98..e0ca22f 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html
@@ -163,7 +163,8 @@ under the License.
<span uib-popover-html="label('longDesc', 'desc')" popover-trigger="click" popover-placement="top" popover-append-to-body="true" popover-class="popover-class">{{label('longDesc', 'title')}}</span> *
</label>
<div class="col-md-10 col-sm-10 col-xs-12">
- <textarea name="longDesc" type="text" class="form-control" ng-model="deliveryService.longDesc" rows="3" autofocus></textarea>
+ <textarea name="longDesc" type="text" class="form-control" ng-model="deliveryService.longDesc" rows="3" required autofocus></textarea>
+ <small class="input-error" ng-show="hasPropertyError(deliveryService.longDesc, 'required')">Required</small>
<small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.longDesc != dsCurrent.longDesc">Current Value: [ {{dsCurrent.longDesc}} ]</small>
<span ng-show="hasError(deliveryServiceForm.longDesc)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
@@ -171,7 +172,7 @@ under the License.
<div class="form-group" ng-class="{'has-error': hasError(deliveryServiceForm.longDesc1), 'has-feedback': hasError(deliveryServiceForm.longDesc1)}">
<label class="control-label col-md-2 col-sm-2 col-xs-12">
- <span uib-popover-html="label('longDesc1', 'desc')" popover-trigger="click" popover-placement="top" popover-append-to-body="true" popover-class="popover-class">{{label('longDesc1', 'title')}}</span> *
+ <span uib-popover-html="label('longDesc1', 'desc')" popover-trigger="click" popover-placement="top" popover-append-to-body="true" popover-class="popover-class">{{label('longDesc1', 'title')}}</span>
</label>
<div class="col-md-10 col-sm-10 col-xs-12">
<textarea name="longDesc1" type="text" class="form-control" ng-model="deliveryService.longDesc1" rows="3" autofocus></textarea>
@@ -182,7 +183,7 @@ under the License.
<div class="form-group" ng-class="{'has-error': hasError(deliveryServiceForm.longDesc2), 'has-feedback': hasError(deliveryServiceForm.longDesc2)}">
<label class="control-label col-md-2 col-sm-2 col-xs-12">
- <span uib-popover-html="label('longDesc2', 'desc')" popover-trigger="click" popover-placement="top" popover-append-to-body="true" popover-class="popover-class">{{label('longDesc2', 'title')}}</span> *
+ <span uib-popover-html="label('longDesc2', 'desc')" popover-trigger="click" popover-placement="top" popover-append-to-body="true" popover-class="popover-class">{{label('longDesc2', 'title')}}</span>
</label>
<div class="col-md-10 col-sm-10 col-xs-12">
<textarea name="longDesc2" type="text" class="form-control" ng-model="deliveryService.longDesc2" rows="3" autofocus></textarea>
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.anyMap.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.anyMap.tpl.html
index e2f9da8..4170dc3 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.anyMap.tpl.html
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.anyMap.tpl.html
@@ -148,7 +148,8 @@ under the License.
<span uib-popover-html="label('longDesc', 'desc')" popover-trigger="click" popover-placement="top" popover-append-to-body="true" popover-class="popover-class">{{label('longDesc', 'title')}}</span> *
</label>
<div class="col-md-10 col-sm-10 col-xs-12">
- <textarea name="longDesc" type="text" class="form-control" ng-model="deliveryService.longDesc" rows="3" autofocus></textarea>
+ <textarea name="longDesc" type="text" class="form-control" ng-model="deliveryService.longDesc" rows="3" required autofocus></textarea>
+ <small class="input-error" ng-show="hasPropertyError(deliveryService.longDesc, 'required')">Required</small>
<small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.longDesc != dsCurrent.longDesc">Current Value: [ {{dsCurrent.longDesc}} ]</small>
<span ng-show="hasError(deliveryServiceForm.longDesc)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
@@ -156,7 +157,7 @@ under the License.
<div class="form-group" ng-class="{'has-error': hasError(deliveryServiceForm.longDesc1), 'has-feedback': hasError(deliveryServiceForm.longDesc1)}">
<label class="control-label col-md-2 col-sm-2 col-xs-12">
- <span uib-popover-html="label('longDesc1', 'desc')" popover-trigger="click" popover-placement="top" popover-append-to-body="true" popover-class="popover-class">{{label('longDesc1', 'title')}}</span> *
+ <span uib-popover-html="label('longDesc1', 'desc')" popover-trigger="click" popover-placement="top" popover-append-to-body="true" popover-class="popover-class">{{label('longDesc1', 'title')}}</span>
</label>
<div class="col-md-10 col-sm-10 col-xs-12">
<textarea name="longDesc1" type="text" class="form-control" ng-model="deliveryService.longDesc1" rows="3" autofocus></textarea>
@@ -167,7 +168,7 @@ under the License.
<div class="form-group" ng-class="{'has-error': hasError(deliveryServiceForm.longDesc2), 'has-feedback': hasError(deliveryServiceForm.longDesc2)}">
<label class="control-label col-md-2 col-sm-2 col-xs-12">
- <span uib-popover-html="label('longDesc2', 'desc')" popover-trigger="click" popover-placement="top" popover-append-to-body="true" popover-class="popover-class">{{label('longDesc2', 'title')}}</span> *
+ <span uib-popover-html="label('longDesc2', 'desc')" popover-trigger="click" popover-placement="top" popover-append-to-body="true" popover-class="popover-class">{{label('longDesc2', 'title')}}</span>
</label>
<div class="col-md-10 col-sm-10 col-xs-12">
<textarea name="longDesc2" type="text" class="form-control" ng-model="deliveryService.longDesc2" rows="3" autofocus></textarea>