Related-Bug: #1456145 - Controlnode - Routes changed the Routing Inst…

…ance combobox to dropdown to use the pagination feature. Change-Id: I71d1c8853bdaf5f479dce1099d5434db2620c151
Juniper · May 27, 2015 · 6613d0d · 6613d0d
1 parent f8b58c9
commit 6613d0d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/webroot/monitor/infra/controlnode/ui/js/monitor_infra_controlnode_routes.js b/webroot/monitor/infra/controlnode/ui/js/monitor_infra_controlnode_routes.js
@@ -126,7 +126,7 @@ monitorInfraControlRoutesClass = (function() {
          var routeLimits = [10, 50, 100, 200];
          var protocols = ['All','XMPP','BGP','ServiceChain','Static'];
 
-         $( "#comboRoutingInstance" + '_' + obj.name ).contrailCombobox({
+         $( "#ddRoutingInstance" + '_' + obj.name ).contrailDropdown({
              defaultValue:'All',
              dataSource: {
                  type:'remote',
@@ -136,10 +136,11 @@ monitorInfraControlRoutesClass = (function() {
                    var ret = []
                    ret =['All'].concat(response['routeInstances']);
                    return ret; 
-                 }
+                 },
+                 timeout:300
              },
          });
-         var comboRoutingInstance = $( "#comboRoutingInstance" + '_' + obj.name ).data('contrailCombobox');
+         var ddRoutingInstance = $( "#ddRoutingInstance" + '_' + obj.name ).data('contrailDropdown');
 
          $( "#comboRoutingTable" + '_' + obj.name ).contrailDropdown({
             data:routeTableList
@@ -186,7 +187,7 @@ monitorInfraControlRoutesClass = (function() {
 
         //Bug : 2360 : Setting default values before the responses for the particular comboboxes are retrieved
         function setDefaults(){
-         comboRoutingInstance.value('All');
+         ddRoutingInstance.value('All');
          comboRoutingTable.value('All');
             comboPeerSource.value('All');
             comboProtocol.value('All');
@@ -255,7 +256,7 @@ monitorInfraControlRoutesClass = (function() {
                 if(newIP != null) {
                     obj.ip = newIP;
                 }            
-                comboRoutingInstance = $( "#comboRoutingInstance" + '_' + obj.name ).data('contrailCombobox');
+                ddRoutingInstance = $( "#ddRoutingInstance" + '_' + obj.name ).data('contrailDropdown');
                 comboRoutingTable = $( "#comboRoutingTable" + '_' + obj.name ).data('contrailDropdown');
                 comboPeerSource = $( "#comboPeerSource" + '_' + obj.name ).data('contrailDropdown');
                 comboProtocol = $( "#comboProtocol" + '_' + obj.name ).data('contrailDropdown');
@@ -264,7 +265,7 @@ monitorInfraControlRoutesClass = (function() {
                 var newAjaxConfig = {url:url,type:'Get'};
                 routeQueryString = { };
 
-                var routeInst = comboRoutingInstance.value(), routeTable = comboRoutingTable.value(),
+                var routeInst = ddRoutingInstance.value(), routeTable = comboRoutingTable.value(),
                     peerSource = comboPeerSource.value(), protocol = comboProtocol.value(), limit = comboLimit.value(), prefix = txtPrefixSearch.val();
                 if (routeInst != 'All')
                     routeQueryString['routingInst'] = routeInst;

diff --git a/webroot/monitor/infra/controlnode/ui/views/monitor_infra_controlnode.view b/webroot/monitor/infra/controlnode/ui/views/monitor_infra_controlnode.view
@@ -110,9 +110,9 @@
                             <div id='formRoutes_{{name}}' class='row-fluid'>
                                 <div class='row-fluid margin-0-0-10'>
 									<div class='span6'>
-										<label for='comboRoutingInstance'>Routing Instance</label>
+										<label for='ddRoutingInstance'>Routing Instance</label>
 										<div>
-			                                <div class='span12' id='comboRoutingInstance_{{name}}' tabindex=0></div>
+			                                <div class='span12' id='ddRoutingInstance_{{name}}' tabindex=0></div>
 										</div>
 									</div>
 									<div class='span2'>