Merge "Closes-Bug:#1464663 Change is to format the interface name in …

…the vrouter details page --> interface tab,when there is fqn Name in name then the name of the interface should be one line and rest of the text should be in next line. Added a formatter function which just returns the column value.Reason to add formatter function is break tag added in the value should be parsed as HTML." into R2.20
Juniper · Jun 15, 2015 · aa13f4d · aa13f4d
2 parents df27d17 + d27f2a2
commit aa13f4d
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/webroot/monitor/infra/vrouter/ui/js/monitor_infra_vrouter_interfaces.js b/webroot/monitor/infra/vrouter/ui/js/monitor_infra_vrouter_interfaces.js
@@ -55,7 +55,7 @@ monitorInfraComputeInterfacesClass = (function() {
                 if(new RegExp(/logical-port|remote-physical-port/).test(obj['type'])) {
                     var parts = obj['name'].split(":"); 
                     if(parts.length == 3){ 
-                        obj['dispName'] = contrail.format('{0} ({1}:{2})',parts[2],parts[0],parts[1]);
+                        obj['dispName'] = contrail.format('{0}<br/> ({1}:{2})',parts[2],parts[0],parts[1]);
                     } 
                 } 
                 if(new RegExp(/vport|logical-port|remote-physical-port/).test(obj['type'])) {
@@ -176,7 +176,13 @@ monitorInfraComputeInterfacesClass = (function() {
                        {
                            field:"dispName",
                            name:"Name",
-                           minWidth:125
+                           minWidth:125,
+                           formatter:function(r,c,v,cd,dc) {
+                               return v;
+                           },
+                           searchFn:function(d){
+                               return d['dispName'];       
+                           }
                        },
                        {
                            field:"label",