Yangman - zero out Status and Time while request in progress

 - Bug 6550 - YangMan - zero out Status and Time while processing the request
 - corrected behavior when request submitted from MODULES
 - code corrected

Change-Id: I65636b6cf89ab5048d0c1a717b00a8ca5d44dd97
Signed-off-by: michal.kovacik <mikovaci@cisco.com>

diff --git a/modules/yangman-resources/src/main/resources/yangman/controllers/request-header.controller.js b/modules/yangman-resources/src/main/resources/yangman/controllers/request-header.controller.js
index 2b2cd09e7bea7f5a3d8ed521dd4c5cc78199a698..fe75ee906b71c48247fa479af90fb8d96d62ed37 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/controllers/request-header.controller.js
+++ b/modules/yangman-resources/src/main/resources/yangman/controllers/request-header.controller.js
@@ -495,6 +495,11 @@ define([
          * Check data before executin operations
          */
         function prepareDataAndExecute(cbk){
+            if (requestHeader.statusObj) {
+                requestHeader.statusObj.statusText = null;
+                requestHeader.statusObj.time = null;
+            }
+
             if ( requestHeader.requestUrl.length ) {
 
                 if ( requestHeader.selectedShownDataType === constants.DISPLAY_TYPE_REQ_DATA ) {

diff --git a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/request-header.tpl.html b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/request-header.tpl.html
index 2493e2779287cb9690ae4a54773369110fa8a813..3857496d1ab94f601e2cb7433da1fcba0a8b1bd3 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/request-header.tpl.html
+++ b/modules/yangman-resources/src/main/resources/yangman/views/rightpanel/request-header.tpl.html
@@ -139,9 +139,12 @@
             <!-- Status -->
             <span flex="30">
                 {{'YANGMAN_STATUS' | translate}}:
-                <span ng-if="requestHeader.statusObj">
+                <span ng-if="requestHeader.statusObj && requestHeader.statusObj.statusText">
                     {{requestHeader.statusObj.status}} {{requestHeader.statusObj.statusText}}
                 </span>
+                <span ng-if="!(requestHeader.statusObj && requestHeader.statusObj.statusText)">
+                    ...
+                </span>
             </span>
 
             <!-- Request time -->
@@ -150,6 +153,9 @@
                 <span ng-if="requestHeader.statusObj && requestHeader.statusObj.time">
                     {{requestHeader.statusObj.time}} ms
                 </span>
+                <span ng-if="!(requestHeader.statusObj && requestHeader.statusObj.time)">
+                    ...
+                </span>
             </span>
         </md-content>
     </section>