diff options
| author |   Wojciech Sliwka <wojciech.sliwka@nokia.com> | 2019-07-15 08:57:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-07-15 08:57:00 +0000 |
| commit | 5f9fd8e2506de6ce7dc27d0fba009724e440f15d (patch) | |
| tree | 497269fd6fe7459dc52663bd19530fae8fa7f172 /vid-app-common/src/main | |
| parent | f486e80d76c2bde1df02876b730fb08822ba547e (diff) | |
| parent | 5468b405aa1a37d1f2095ad68073fb370a5a8112 (diff) | |
Merge "Moving report button up, and setting feature flag on"
Diffstat (limited to 'vid-app-common/src/main')
3 files changed, 7 insertions, 7 deletions
diff --git a/vid-app-common/src/main/webapp/WEB-INF/conf/features.properties b/vid-app-common/src/main/webapp/WEB-INF/conf/features.properties index b7634aa45..fd236c39a 100644 --- a/vid-app-common/src/main/webapp/WEB-INF/conf/features.properties +++ b/vid-app-common/src/main/webapp/WEB-INF/conf/features.properties @@ -26,7 +26,7 @@ FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE = true FLAG_1810_AAI_LOCAL_CACHE = true FLAG_EXP_USE_DEFAULT_HOST_NAME_VERIFIER = false FLAG_HANDLE_SO_WORKFLOWS = true -FLAG_CREATE_ERROR_REPORTS = false +FLAG_CREATE_ERROR_REPORTS = true # Modern UI (Drawing-Board; View/Edit) # - - - - - - - - - - - - - - - - - - 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 49d3ef868..42fe083ab 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 @@ -9,7 +9,9 @@ </div>
<div class="error" ng-show="isErrorVisible">
- <img src="app/vid/images/error.png"></img>{{error}}
+ <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}}">
@@ -36,8 +38,6 @@ ng-click="confirm();">Confirm</button>
<button type="button" data-tests-id="cancelButton" ng-click="cancel();" att-button
btn-type="primary" size="small">Cancel</button>
- <button class="btn-danger" ng-if="isShowErrorReport() && isServiceError" att-button size="small"
- ng-click="showReportWindow()">Create report</button>
</div>
</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 10179243e..7cd0ab3b2 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 @@ -33,7 +33,9 @@ ngx-show="{{isProgressVisible}}"></div>
<div class="error" ng-show="!isProgressVisible">
- <img src="app/vid/images/error.png"></img>{{error}}
+ <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>
@@ -43,8 +45,6 @@ <div class="buttonRow">
<button data-tests-id="msoCommitDialogCloseButton" ngx-enabled="{{isCloseEnabled}}" att-button size="small"
ng-click="close();">Close</button>
- <button class="btn-danger" att-button size="small" ng-show="!isProgressVisible"
- ng-click="showReportWindow()">Create report</button>
</div>
</div>
</div>
\ No newline at end of file |