From: Amichai Hemli <amichai.hemli@intl.att.com>
Date: Thu, 13 Feb 2020 10:35:28 +0000 (+0200)
Subject: create error button should be displayed according to the feature flag
X-Git-Tag: 6.0.3~37^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=5b781939b48225e69e2a7f7bfa7c0abdc2cb4d67;p=vid.git

create error button should be displayed according to the feature flag

Issue-ID: VID-736
Signed-off-by: Amichai Hemli <amichai.hemli@intl.att.com>
Change-Id: If9b2cea46dedfa00fd8a938c7a915af602df18e8
---

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/creationDialog.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/creationDialog.htm
index 42fe083ab..9b0d99f1b 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/creationDialog.htm
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/creationDialog.htm
@@ -1,47 +1,47 @@
-<div  ng-controller="creationDialogController">
-	<div ng-show="isDialogVisible">
-		<iframe class="popup" scrolling="no" ng-if="!shouldShowOldPopup()" id="iframe_callback"  ng-src={{url}}></iframe>
-		<div ng-if="shouldShowOldPopup()">
-			<div class="titleLine">
-				<img src="app/vid/images/spinner.gif"
-					ngx-visible="{{isSpinnerVisible}}"></img>
-				<h3 data-tests-id="create-modal-title">Create {{componentName}} -- {{createType}}</h3>
-			</div>
-
-			<div class="error" ng-show="isErrorVisible">
-				<button class="btn-danger" att-button size="small" ng-click="showReportWindow()">Create report</button>
-				<img src="app/vid/images/error.png"></img>
-				{{error}} <br>
-			</div>
-
-			<div ngx-visible="{{isDataVisible}}">
-				<parameter-block control="summaryControl"></parameter-block>
-				<h4>
-					User Provided Data (<img class="requiredIndicator"
-						src="app/vid/images/asterisk.png" height='10' width='10'></img> indicates required field)
-				</h4>
-				<parameter-block control="userProvidedControl"
-					callback="userParameterChanged(id);" editable></parameter-block>
-				<div class="prompt">
-					<p>
-						Enter Data and <span>Confirm</span> to<br />Create <span>{{componentName}}</span>
-					</p>
-					<p>
-						<span>Cancel</span> to Return to Previous Page.<br />Data entered
-						will be lost
-					</p>
-				</div>
-
-			</div>
-			<div class="buttonRow">
-				<button data-tests-id="confirmButton" ngx-enabled="{{isConfirmEnabled}}" att-button size="small"
-						ng-click="confirm();">Confirm</button>
-				<button type="button" data-tests-id="cancelButton" ng-click="cancel();" att-button
-						btn-type="primary" size="small">Cancel</button>
-			</div>
-		</div>
-	</div>
-
-	<div ng-include="'app/vid/scripts/view-models/msoCommit.htm'"></div>
-
-</div>
+<div  ng-controller="creationDialogController">
+	<div ng-show="isDialogVisible">
+		<iframe class="popup" scrolling="no" ng-if="!shouldShowOldPopup()" id="iframe_callback"  ng-src={{url}}></iframe>
+		<div ng-if="shouldShowOldPopup()">
+			<div class="titleLine">
+				<img src="app/vid/images/spinner.gif"
+					ngx-visible="{{isSpinnerVisible}}"></img>
+				<h3 data-tests-id="create-modal-title">Create {{componentName}} -- {{createType}}</h3>
+			</div>
+
+			<div class="error" ng-show="isErrorVisible">
+				<button class="btn-danger" att-button size="small" ng-click="showReportWindow()" ng-if="isShowErrorReport()">Create report</button>
+				<img src="app/vid/images/error.png"></img>
+				{{error}} <br>
+			</div>
+
+			<div ngx-visible="{{isDataVisible}}">
+				<parameter-block control="summaryControl"></parameter-block>
+				<h4>
+					User Provided Data (<img class="requiredIndicator"
+						src="app/vid/images/asterisk.png" height='10' width='10'></img> indicates required field)
+				</h4>
+				<parameter-block control="userProvidedControl"
+					callback="userParameterChanged(id);" editable></parameter-block>
+				<div class="prompt">
+					<p>
+						Enter Data and <span>Confirm</span> to<br />Create <span>{{componentName}}</span>
+					</p>
+					<p>
+						<span>Cancel</span> to Return to Previous Page.<br />Data entered
+						will be lost
+					</p>
+				</div>
+
+			</div>
+			<div class="buttonRow">
+				<button data-tests-id="confirmButton" ngx-enabled="{{isConfirmEnabled}}" att-button size="small"
+						ng-click="confirm();">Confirm</button>
+				<button type="button" data-tests-id="cancelButton" ng-click="cancel();" att-button
+						btn-type="primary" size="small">Cancel</button>
+			</div>
+		</div>
+	</div>
+
+	<div ng-include="'app/vid/scripts/view-models/msoCommit.htm'"></div>
+
+</div>
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/msoCommit.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/msoCommit.htm
index 7cd0ab3b2..11ef3338e 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/msoCommit.htm
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/msoCommit.htm
@@ -1,50 +1,50 @@
-<!--
-  ============LICENSE_START=======================================================
-  VID
-  ================================================================================
-  Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<div ng-controller="msoCommitController" ng-show="isViewVisible" >
-<div ng-if="isViewVisible">
-	<div class="statusLine">
-		<img src="app/vid/images/spinner.gif"
-			ngx-visible="{{isSpinnerVisible}}"> </img> <label>Status:</label><span
-			class="status">{{status}}</span>
-	</div>
-
-	<div class="feedback">
-
-		<div progress-bar control="progressBarControl"
-			value="{{percentProgress}}" increases-only="true"
-			ngx-show="{{isProgressVisible}}"></div>
-
-		<div class="error" ng-show="!isProgressVisible">
-			<button class="btn-danger" att-button size="small" ng-click="showReportWindow()">Create report</button>
-			<img src="app/vid/images/error.png"></img>
-			{{error}}
-		</div>
-
-	</div>
-
-	<pre class="log">{{log}}</pre>
-
-	<div class="buttonRow">
-		<button data-tests-id="msoCommitDialogCloseButton" ngx-enabled="{{isCloseEnabled}}" att-button size="small"
-			ng-click="close();">Close</button>
-	</div>
-</div>
+<!--
+  ============LICENSE_START=======================================================
+  VID
+  ================================================================================
+  Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
+
+<div ng-controller="msoCommitController" ng-show="isViewVisible" >
+<div ng-if="isViewVisible">
+	<div class="statusLine">
+		<img src="app/vid/images/spinner.gif"
+			ngx-visible="{{isSpinnerVisible}}"> </img> <label>Status:</label><span
+			class="status">{{status}}</span>
+	</div>
+
+	<div class="feedback">
+
+		<div progress-bar control="progressBarControl"
+			value="{{percentProgress}}" increases-only="true"
+			ngx-show="{{isProgressVisible}}"></div>
+
+		<div class="error" ng-show="!isProgressVisible">
+			<button class="btn-danger" att-button size="small" ng-click="showReportWindow()" ng-if="isShowErrorReport()">Create report</button>
+			<img src="app/vid/images/error.png"></img>
+			{{error}}
+		</div>
+
+	</div>
+
+	<pre class="log">{{log}}</pre>
+
+	<div class="buttonRow">
+		<button data-tests-id="msoCommitDialogCloseButton" ngx-enabled="{{isCloseEnabled}}" att-button size="small"
+			ng-click="close();">Close</button>
+	</div>
+</div>
 </div>
\ No newline at end of file