Moving report button up, and setting feature flag on

Change-Id: I3df31fe42c2b7e0bec3b52f2886726419a22f681
Issue-ID: VID-488
Signed-off-by: Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com>

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 b7634aa..fd236c3 100644 (file)
--- 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 49d3ef8..42fe083 100755 (executable)
--- 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>\r
 \r
                        <div class="error" ng-show="isErrorVisible">\r
-                               <img src="app/vid/images/error.png"></img>{{error}}\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
@@ -36,8 +38,6 @@
                                                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
-                               <button class="btn-danger" ng-if="isShowErrorReport() && isServiceError" att-button size="small"\r
-                                               ng-click="showReportWindow()">Create report</button>\r
                        </div>\r
                </div>\r
        </div>\r

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 1017924..7cd0ab3 100755 (executable)
--- 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>\r
 \r
                <div class="error" ng-show="!isProgressVisible">\r
-                       <img src="app/vid/images/error.png"></img>{{error}}\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
@@ -43,8 +45,6 @@
        <div class="buttonRow">\r
                <button data-tests-id="msoCommitDialogCloseButton" ngx-enabled="{{isCloseEnabled}}" att-button size="small"\r
                        ng-click="close();">Close</button>\r
-               <button class="btn-danger" att-button size="small" ng-show="!isProgressVisible"\r
-                               ng-click="showReportWindow()">Create report</button>\r
        </div>\r
 </div>\r
 </div>
\ No newline at end of file