create error button should be displayed according to the feature flag 64/101664/1
authorAmichai Hemli <amichai.hemli@intl.att.com>
Thu, 13 Feb 2020 10:35:28 +0000 (12:35 +0200)
committerAmichai Hemli <amichai.hemli@intl.att.com>
Thu, 13 Feb 2020 10:35:28 +0000 (12:35 +0200)
Issue-ID: VID-736
Signed-off-by: Amichai Hemli <amichai.hemli@intl.att.com>
Change-Id: If9b2cea46dedfa00fd8a938c7a915af602df18e8

vid-app-common/src/main/webapp/app/vid/scripts/view-models/creationDialog.htm
vid-app-common/src/main/webapp/app/vid/scripts/view-models/msoCommit.htm

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