YangUI post history request filling and sending data bug fixed:

Change-Id: I0882bc8c103e0aaa3436a45d28b2ed72d27f6b0d
Signed-off-by: Daniel Kuzma <dakuzma@cisco.com>
Signed-off-by: Juraj Sebin <jsebin@cisco.com>

diff --git a/modules/yangui-resources/src/main/resources/yangui/views/modal/request-modal.tpl.html b/modules/yangui-resources/src/main/resources/yangui/views/modal/request-modal.tpl.html
index f7d599fb5e47c3617cff484c9d566f31880887a6..b1b8a1ffd358b77844f10caed3f9063c2b31fb80 100644 (file)
--- a/modules/yangui-resources/src/main/resources/yangui/views/modal/request-modal.tpl.html
+++ b/modules/yangui-resources/src/main/resources/yangui/views/modal/request-modal.tpl.html
@@ -50,6 +50,10 @@
                                             </div>\r
                                             <div class="tddiv rh-col7">\r
                                                 <div class="requestActions">\r
+                                                    <div class="inlineBlock" tooltip="{{ req.availability ? 'YANGUI_RUN' : 'YANGUI_API_NA_ERROR_TT' | translate }}">\r
+                                                        <button ng-disabled="!req.availability" class="yangButton iconNext {{ req.availability ? '' : 'disabled' }}" ng-click='executeCollectionRequest(req)'></button>\r
+                                                    </div>\r
+\r
                                                     <div class="inlineBlock historyRequestBox" tooltip="{{ 'YANGUI_ADD_TO_COLLECTION' | translate }}">\r
                                                         <div class="yangButton iconPlus inlineBlock" ng-click='showCollBox($event)'></div>\r
                                                         <div class="collBox popupContainer" ng-controller="collBoxCtrl">\r
@@ -75,9 +79,7 @@
                                                 <button class="yangButton iconFillData {{ req.availability && (req.receivedData || req.sentData) ? '' : 'disabled' }}" ng-click='fillApiAndData(req)'></button>\r
                                                     </div>\r
 \r
-                                                    <div class="inlineBlock" tooltip="{{ req.availability ? 'YANGUI_RUN' : 'YANGUI_API_NA_ERROR_TT' | translate }}">\r
-                                                        <button ng-disabled="!req.availability" class="yangButton iconNext {{ req.availability ? '' : 'disabled' }}" ng-click='executeCollectionRequest(req)'></button>\r
-                                                    </div>\r
+                                                    \r
 \r
                                                     <button class="yangButton iconClose" ng-click="deleteRequestItem(req, 'requestList')" tooltip="{{ 'YANGUI_DELETE' | translate }}"></button>\r
                                                 </div>\r
@@ -151,16 +153,17 @@
                                             </div>\r
                                             <div class="tddiv rh-col7">\r
                                                 <div class="requestActions">\r
-                                                    <div class="inlineBlock" tooltip="{{ req.availability ? (req.receivedData || req.sentData) ? 'YANGUI_FILL_DATA_TT' : 'YANGUI_REC_SENT_DATA_ERROR_TT' : 'YANGUI_API_NA_ERROR_TT' | translate }}">\r
-                                                    <button class="yangButton iconFillData {{ req.availability && (req.receivedData || req.sentData) ? '' : 'disabled' }}" ng-click='fillApiAndData(req)'>\r
-                                                        </button>\r
-                                                    </div>\r
 \r
                                                     <div class="inlineBlock" tooltip="{{ req.availability ? 'YANGUI_RUN' : 'YANGUI_API_NA_ERROR_TT' | translate }}">\r
                                                         <button ng-disabled="!req.availability" class="yangButton iconNext {{ req.availability ? '' : 'disabled' }}" ng-click='executeCollectionRequest(req)'>\r
                                                         </button>\r
                                                     </div>\r
 \r
+                                                    <div class="inlineBlock" tooltip="{{ req.availability ? (req.receivedData || req.sentData) ? 'YANGUI_FILL_DATA_TT' : 'YANGUI_REC_SENT_DATA_ERROR_TT' : 'YANGUI_API_NA_ERROR_TT' | translate }}">\r
+                                                    <button class="yangButton iconFillData {{ req.availability && (req.receivedData || req.sentData) ? '' : 'disabled' }}" ng-click='fillApiAndData(req)'>\r
+                                                        </button>\r
+                                                    </div>\r
+\r
                                                     <div class="inlineBlock historyRequestBox" tooltip="{{ 'YANGUI_CHANGE_GROUP' | translate }}">\r
                                                         <div class="yangButton iconChangeGroup inlineBlock" ng-click="showCollBox($event)"></div>\r
                                                         <div class="collBox changeGroup popupContainer" ng-controller="collBoxCtrl">\r

diff --git a/modules/yangui-resources/src/main/resources/yangui/yangui.controller.js b/modules/yangui-resources/src/main/resources/yangui/yangui.controller.js
index 70ce9f0148b55ebcf6993fd2fa6f5bbec2e8086f..8f49192658d82f3c17f0215e1d49367c4100e7bc 100644 (file)
--- a/modules/yangui-resources/src/main/resources/yangui/yangui.controller.js
+++ b/modules/yangui-resources/src/main/resources/yangui/yangui.controller.js
@@ -305,7 +305,7 @@ define(['app/yangui/yangui.module', 'app/yangui/yangui.services', 'app/yangui/di
                   if(operation === 'GET'){\r
                       requestData = {};\r
                   }\r
-                  $scope.$broadcast('YUI_ADD_TO_HISTORY', 'success', data, requestData, operation, requestPath);\r
+                  $scope.$broadcast('YUI_ADD_TO_HISTORY', 'success', data, preparedRequestData, operation, requestPath);\r
 \r
                   if ( angular.isFunction(callback) ) {\r
                       callback(data);\r
@@ -330,7 +330,7 @@ define(['app/yangui/yangui.module', 'app/yangui/yangui.services', 'app/yangui/di
                   if(operation === 'GET'){\r
                       requestData = {};\r
                   }\r
-                  $scope.$broadcast('YUI_ADD_TO_HISTORY', 'error', resp.data, requestData, operation, requestPath);\r
+                  $scope.$broadcast('YUI_ADD_TO_HISTORY', 'error', resp.data, preparedRequestData, operation, requestPath);\r
 \r
                   console.info('error sending request to',$scope.selSubApi.buildApiRequestString(),'reqString',reqString,'got',resp.status,'data',resp.data);\r
               }\r