From: michal.kovacik <mikovaci@cisco.com>
Date: Thu, 29 Sep 2016 14:17:17 +0000 (+0200)
Subject: Yangman - zero out Status and Time-update
X-Git-Tag: release/carbon~16^2~5
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=abfe86c7959cf587e2c113c8a21e4b4c777fd505;p=dlux.git

Yangman - zero out Status and Time-update

- Bug 6550 - YangMan - zero out Status and Time while processing the request
- update: previous fix did not work in some cases

Change-Id: Ief0a692f495e0e696f989ddf66c0c3049eb23216
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 79ea725c..8e6598d0 100644
--- 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
@@ -7,11 +7,11 @@ define([
     angular.module('app.yangman').controller('RequestHeaderCtrl', RequestHeaderCtrl);
 
     RequestHeaderCtrl.$inject = [
-        '$mdDialog', '$mdToast', '$scope', '$rootScope', 'ENV', 'YangmanService', 'ParametersService',
+        '$timeout', '$mdDialog', '$mdToast', '$scope', '$rootScope', 'ENV', 'YangmanService', 'ParametersService',
         'PathUtilsService', 'RequestsService', '$filter', 'DataBackupService', 'constants', 'TimeTrackingService'
     ];
 
-    function RequestHeaderCtrl($mdDialog, $mdToast, $scope, $rootScope, ENV, YangmanService, ParametersService,
+    function RequestHeaderCtrl($timeout, $mdDialog, $mdToast, $scope, $rootScope, ENV, YangmanService, ParametersService,
                                PathUtilsService, RequestService, $filter, DataBackupService, constants,
                                TimeTrackingService) {
         var requestHeader = this;
@@ -522,16 +522,17 @@ define([
                 requestHeader.statusObj.statusText = null;
                 requestHeader.statusObj.time = null;
             }
-
-            if ( requestHeader.requestUrl.length ) {
-
-                if ( requestHeader.selectedShownDataType === constants.DISPLAY_TYPE_REQ_DATA ) {
-                    // get json data
-                    var params = { reqData: null };
-                    $scope.rootBroadcast(constants.YANGMAN_GET_CODEMIRROR_DATA_SENT, params);
-                    executeOperation(params.reqData ? angular.fromJson(params.reqData) : {}, cbk);
-                } else {
-                    executeOperation({}, cbk);
+            $timeout(prepareData);
+            function prepareData() {
+                if ( requestHeader.requestUrl.length ) {
+                    if ( requestHeader.selectedShownDataType === constants.DISPLAY_TYPE_REQ_DATA ) {
+                        // get json data
+                        var params = { reqData: null };
+                        $scope.rootBroadcast(constants.YANGMAN_GET_CODEMIRROR_DATA_SENT, params);
+                        executeOperation(params.reqData ? angular.fromJson(params.reqData) : {}, cbk);
+                    } else {
+                        executeOperation({}, cbk);
+                    }
                 }
             }
         }