From b67ad4e62649d3e0c4cec1babf5134d116448891 Mon Sep 17 00:00:00 2001
From: Siva Bavanasi <kbsiva@juniper.net>
Date: Tue, 8 Nov 2016 11:18:04 +0530
Subject: [PATCH] Fixed Refresh and delete issues with network route table page

Change-Id: I0cc2c49303d7daefc041e3d4646378bb60fd8d51
Closes-bug: #1619669
Closes-bug: #1619657
(cherry picked from commit 4e38e2615f27a2a96d5b22de1e1335516bea47b9)
---
 .../networking/routetable/ui/js/views/RtTableGridView.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/webroot/config/networking/routetable/ui/js/views/RtTableGridView.js b/webroot/config/networking/routetable/ui/js/views/RtTableGridView.js
index 706a4ccd4..8cc181d25 100644
--- a/webroot/config/networking/routetable/ui/js/views/RtTableGridView.js
+++ b/webroot/config/networking/routetable/ui/js/views/RtTableGridView.js
@@ -297,11 +297,14 @@ define([
         ];
     }
 
+    function getActiveRouteTableTabIndex() {
+        return $('#' + ctwl.RT_TABLE_TAB_ID).tabs('option', 'active');
+    }
+
     function getHeaderActionConfig(tabText) {
         var rtTableName = getRtTableDisplayName();
         var tabId = $('#rt-table-tab').tabs('option', 'active');
         var tabText = 'Tab' + tabId.toString();
-        gridElId = elId + 'Tab' + tabId.toString();
         var headerActionConfig = [
             {
                 "type": "link",
@@ -310,6 +313,8 @@ define([
                 "linkElementId": 'btnActionDelRtTable' + tabText,
                 "onClick": function() {
                      var rtTableModel = new RtTableModel();
+                     tabId = getActiveRouteTableTabIndex();
+                     gridElId = elId + 'Tab' + tabId.toString();
                      var checkedRows =
                          $(gridElId).data("contrailGrid").getCheckedRows();
 
@@ -332,6 +337,8 @@ define([
                 "onClick": function() {
                     var projFqn = [getCookie('domain'),
                         getCookie('project')];
+                    tabId = getActiveRouteTableTabIndex();
+                    gridElId = elId + 'Tab' + tabId.toString();
                     rtTableModel = new RtTableModel();
                     rtTableEditView.model = rtTableModel;
                     rtTableEditView.renderConfigureRtTable({