dewrich closed pull request #2588: TP ds longdesc1 and 2 are not required
URL: https://github.com/apache/trafficcontrol/pull/2588
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 113098416..f01b9d774 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 @@
<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 @@
<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 @@
<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 b412112eb..925be25fc 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 @@
<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 @@
<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 @@
<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 b42ea9861..e0ca22f12 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 @@
<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 @@
<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 @@
<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 e2f9da819..4170dc300 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 @@
<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 @@
<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 @@
<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>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
