X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=POLICY-SDK-APP%2Fsrc%2Fmain%2Fwebapp%2Fapp%2FpolicyApp%2Fpolicy-models%2FEditor%2FPolicyTemplates%2FDCAEMicroServicePolicyTemplate.html;h=11472b96a099973e753bc38005bbe669b21299be;hb=84dfe2ecbdb18041ddfc49ac0beeb650238ff37c;hp=945e8655a04ea5c7abccc6cadc7f3cc5c6599daf;hpb=e0addf5b588a1244f9679becd90999dfcb4c3a94;p=policy%2Fengine.git

diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DCAEMicroServicePolicyTemplate.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DCAEMicroServicePolicyTemplate.html
index 945e8655a..11472b96a 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DCAEMicroServicePolicyTemplate.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DCAEMicroServicePolicyTemplate.html
@@ -17,15 +17,15 @@
 			</div>
 			<div class="form-group row">
 				<div class="form-group col-sm-3">
-					<label>Ecomp Name:<sup><b>*</b></sup></label> <select
+					<label>Onap Name:<sup><b>*</b></sup></label> <select
 						class="form-control" ng-disabled="temp.policy.readOnly"
-						ng-model="temp.policy.ecompName"
-						ng-options="option for option in ecompNameDictionaryDatas track by option"
-						required pattern="\S+" title="EcompName is required"></select>
+						ng-model="temp.policy.onapName"
+						ng-options="option for option in onapNameDictionaryDatas track by option"
+						required pattern="\S+" title="OnapName is required"></select>
 				</div>
 				<div class="form-group col-sm-3">
-					<label>Time to Live Date:</label> <input type="date"
-						class="form-control" name="ttlDate" class="date"
+					<label>Time to Live Date:</label> <input type="text" id="ttlDate"
+						class="form-control" name="ttlDate" ng-disabled="temp.policy.readOnly"
 						ng-model="temp.policy.ttlDate" />
 				</div>
 				<div class="form-group col-sm-3">
@@ -83,7 +83,7 @@
 			</div>
 		</div>
 		<div class="well">
-			<div class="form-group col-sm-3" id="DynamicTemplate">
+			<div class="form-group col-sm-12" id="DynamicTemplate">
 				<label>Micro Service Attributes:<sup><b>*</b></sup></label><br>
 			</div>
 			</br>
@@ -93,26 +93,26 @@
 					class="form-control"  class="form-control"
 					ng-disabled="temp.policy.readOnly"
 					ng-model="temp.policy.configName"
-					ng-options="option for option in microServiceCongigNameDictionaryDatas track by option"></select>
+					ng-options="option for option in microServiceCongigNameDictionaryDatas track by option" required="true"></select>
 			</div>
 			<div class="form-group col-sm-3" ng-show="isCheck">
 				<label>Location:<sup><b>*!</b></sup></label><br> <select
 					class="form-control"  class="form-control"
 					ng-disabled="temp.policy.readOnly" ng-model="temp.policy.location"
-					ng-options="option for option in microServiceLocationDictionaryDatas track by option"></select>
+					ng-options="option for option in microServiceLocationDictionaryDatas track by option" required="true"></select>
 			</div>
 			<div class="form-group col-sm-3" ng-show="isCheck">
 				<label>UUID:<sup><b>*!</b></sup></label><br> <select
 					class="form-control"  class="form-control"
 					ng-disabled="temp.policy.readOnly" ng-model="temp.policy.uuid"
-					ng-options="option for option in dcaeUUIDDictionaryDatas track by option"></select>
+					ng-options="option for option in dcaeUUIDDictionaryDatas track by option" required="true"></select>
 			</div>
 			<div class="form-group col-sm-3" ng-show="isCheck">
 				<label>Policy Scope:<sup><b>*</b></sup></label><br> <select
 					class="form-control"  class="form-control"
 					ng-disabled="temp.policy.readOnly"
 					ng-model="temp.policy.policyScope"
-					ng-options="option for option in groupPolicyScopeListDatas track by option"></select>
+					ng-options="option for option in groupPolicyScopeListDatas track by option" required="true"></select>
 			</div>
 		</div>
 		</div>
@@ -126,9 +126,7 @@
 			<button class="btn btn-success" herf="javascript:void(0)"
 				ng-disabled="savebutton" ng-disabled="temp.policy.readOnly"
 				ng-click="savePolicy(temp);">Save</button>
-			<button type="button" class="btn btn-default" data-dismiss="modal"
-				ng-disabled="temp.inprocess" ng-model="finalPath"
-				ng-controller="FileManagerCtrl" ng-click="closefunction(finalPath);">Close</button>
+			<button type="button" class="btn btn-default" ng-click="refresh();">Close</button>
 		</div>
 	</form>
 </div>