Correct modal ID

[controller.git] / opendaylight / web / devices / src / main / resources / js / page.js

diff --git a/opendaylight/web/devices/src/main/resources/js/page.js b/opendaylight/web/devices/src/main/resources/js/page.js
index 6cc2b61d1b2a75f9e2636e21e45f3d174b134caf..9524a76b012a1cb2d6a568aba3c51cb3ad975ac9 100644 (file)
--- a/opendaylight/web/devices/src/main/resources/js/page.js
+++ b/opendaylight/web/devices/src/main/resources/js/page.js
@@ -14,7 +14,7 @@ one.f = {};
 one.f.dashlet = {
     nodesLearnt : {
         id : 'nodesLearnt',
-        name : 'Nodes Learnt'
+        name : 'Nodes Learned'
     },
     staticRouteConfig : {
         id : 'staticRouteConfig',
@@ -150,7 +150,7 @@ one.f.switchmanager.nodesLearnt = {
                 });
             },
             popout: function() {
-                var h3 = "Nodes Learnt";
+                var h3 = "Nodes Learned";
                 var footer = one.f.switchmanager.nodesLearnt.modal.footer.popout();
                 var $modal = one.lib.modal.spawn(one.f.switchmanager.nodesLearnt.id.modal.modal, h3, "", footer);
                 var $body = one.f.switchmanager.nodesLearnt.modal.body.popout($modal);
@@ -321,9 +321,14 @@ one.f.switchmanager.nodesLearnt = {
                         ' privilege=' + data.privilege + '>' + nodeNameEntry + '</a>';
                         
                         var ports = item.ports;
+                        var portsMatch = ports.match(/<\/span>/g);
+                        var portsLength = 0;
+                        if (portsMatch != null) {
+                            portsLength = portsMatch.length;
+                        }
                         item.ports = '<span class="nodePorts" style="cursor:pointer;color: #08c" ports='+encodeURIComponent(JSON.stringify(item.ports)) + ' nodeId=' + item.nodeId 
                             + ' nodeName=' + nodeName  
-                            + '>' + ports.match(/<\/span>/g).length+'</span>';
+                            + '>' + portsLength +'</span>';
                     }); 
                     },
                     delay: 0
@@ -364,9 +369,14 @@ one.f.switchmanager.nodesLearnt = {
                     formatter: function(items) {
                         $.each(items, function (index, item) {
                             var ports = item.ports;
+                            var portsMatch = ports.match(/<\/span>/g);
+                            var portsLength = 0;
+                            if (portsMatch != null) {
+                                portsLength = portsMatch.length;
+                            }
                             item.ports = '<span class="nodePorts" style="cursor: pointer;color: #08c" ports='+encodeURIComponent(JSON.stringify(item.ports)) + ' nodeId=' + item.nodeId 
                                 + ' nodeName=' + item.nodeName  
-                                + '>' + ports.match(/<\/span>/g).length+'</span>';
+                                + '>' + portsLength +'</span>';
                         }); 
                     },
                     delay: 0
@@ -454,6 +464,7 @@ one.f.switchmanager.subnetGatewayConfig = {
         }, 
         modal: {
             modal: "one_f_switchmanager_subnetGatewayConfig_id_modal_modal",
+                       ports : "one_f_switchmanager_subnetGatewayConfig_id_modal_ports",
             save: "one_f_switchmanager_subnetGatewayConfig_id_modal_save",
             form: {
                 name : "one_f_switchmanager_subnetGatewayConfig_id_modal_form_gatewayname",
@@ -482,8 +493,8 @@ one.f.switchmanager.subnetGatewayConfig = {
                 $dashlet.append($button);
 
                 // Delete gateway ip address button
-                var button = one.lib.dashlet.button.single("Delete Gateway IP Address(es)",
-                    one.f.switchmanager.subnetGatewayConfig.id.dashlet.removeIPAddress, "btn-primary", "btn-mini");
+                var button = one.lib.dashlet.button.single("Delete Gateway IP Address",
+                    one.f.switchmanager.subnetGatewayConfig.id.dashlet.removeIPAddress, "btn-danger", "btn-mini");
                 var $button = one.lib.dashlet.button.button(button);
                 $button.click(function() {
                     var requestData = {};
@@ -492,6 +503,10 @@ one.f.switchmanager.subnetGatewayConfig = {
                     checkedCheckBoxes.each(function(index, value) {
                         gatewaysToDelete.push(checkedCheckBoxes[index].id);
                     });
+                    if (checkedCheckBoxes.size() === 0) {
+                       alert('Please select at least one gateway');
+                       return false;
+                    }
                     if (gatewaysToDelete.length > 0) {
                         requestData["gatewaysToDelete"] = gatewaysToDelete.toString();
                         var url = one.f.switchmanager.rootUrl + "/subnetGateway/delete";
@@ -532,7 +547,7 @@ one.f.switchmanager.subnetGatewayConfig = {
                     $("#" + one.f.switchmanager.subnetGatewayConfig.id.dashlet.datagrid).find(':checkbox').prop('checked',
                         $("#"+one.f.switchmanager.subnetGatewayConfig.id.dashlet.selectAll).is(':checked'));
                 });
-                $(".subnetGatewayConfig").click(function(){
+                $(".subnetGatewayConfig").click(function(e){
                     if (!$('.subnetGatewayConfig[type=checkbox]:not(:checked)').length) {
                         $("#"+one.f.switchmanager.subnetGatewayConfig.id.dashlet.selectAll)
                             .prop("checked",
@@ -542,7 +557,7 @@ one.f.switchmanager.subnetGatewayConfig = {
                             .prop("checked",
                          false);
                     }
-                    event.stopPropagation();
+                    e.stopPropagation();
                 });
              });
         });
@@ -572,7 +587,7 @@ one.f.switchmanager.subnetGatewayConfig = {
             ports: function() {
                 var h3 = "Add Ports";
                 var footer = one.f.switchmanager.subnetGatewayConfig.modal.footer();
-                var $modal = one.lib.modal.spawn(one.f.switchmanager.subnetGatewayConfig.id.modal.modal, h3, "", footer);
+                var $modal = one.lib.modal.spawn(one.f.switchmanager.subnetGatewayConfig.id.modal.ports, h3, "", footer);
                 // bind save button
                 $('#' + one.f.switchmanager.subnetGatewayConfig.id.modal.save, $modal).click(function() {
                     one.f.switchmanager.subnetGatewayConfig.modal.save.ports($modal);
@@ -883,7 +898,7 @@ one.f.switchmanager.staticRouteConfig = {
                 $dashlet.append($button);
 
                 // Delete static route button
-                var button = one.lib.dashlet.button.single("Delete Static Route(s)", one.f.switchmanager.staticRouteConfig.id.dashlet.remove, "btn-primary", "btn-mini");
+                var button = one.lib.dashlet.button.single("Delete Static Route(s)", one.f.switchmanager.staticRouteConfig.id.dashlet.remove, "btn-danger", "btn-mini");
                 var $button = one.lib.dashlet.button.button(button);
                 $button.click(function() {
                     var requestData = {};
@@ -893,6 +908,10 @@ one.f.switchmanager.staticRouteConfig = {
                     checkedCheckBoxes.each(function(index, value) {
                         routesToDelete.push(checkedCheckBoxes[index].id);
                     });
+                    if (checkedCheckBoxes.size() === 0) {
+                       alert('Please select at least one static route');
+                       return false;
+                    }
                     if (routesToDelete.length > 0) {
                         requestData["routesToDelete"] = routesToDelete.toString();
                         var url = one.f.switchmanager.rootUrl + "/staticRoute/delete";
@@ -923,7 +942,7 @@ one.f.switchmanager.staticRouteConfig = {
                     $("#" + one.f.switchmanager.staticRouteConfig.id.dashlet.datagrid).find(':checkbox').prop('checked',
                         $("#"+one.f.switchmanager.staticRouteConfig.id.dashlet.selectAll).is(':checked'));
                 });
-                $(".staticRoute").click(function(){
+                $(".staticRoute").click(function(e){
                     if (!$('.staticRoute[type=checkbox]:not(:checked)').length) {
                         $("#"+one.f.switchmanager.staticRouteConfig.id.dashlet.selectAll)
                             .prop("checked",
@@ -933,7 +952,7 @@ one.f.switchmanager.staticRouteConfig = {
                             .prop("checked",
                          false);
                     }
-                    event.stopPropagation();
+                    e.stopPropagation();
                 });
              });
         });
@@ -1114,7 +1133,7 @@ one.f.switchmanager.spanPortConfig = {
                 $dashlet.append($button);
 
                 // Delete span port button
-                var button = one.lib.dashlet.button.single("Delete SPAN Port(s)", one.f.switchmanager.spanPortConfig.id.dashlet.remove, "btn-primary", "btn-mini");
+                var button = one.lib.dashlet.button.single("Delete SPAN Port(s)", one.f.switchmanager.spanPortConfig.id.dashlet.remove, "btn-danger", "btn-mini");
                 var $button = one.lib.dashlet.button.button(button);
                 $button.click(function() {
 
@@ -1124,6 +1143,10 @@ one.f.switchmanager.spanPortConfig = {
                         checkedCheckBoxes.each(function(index, value) {
                             spanPortsToDelete += decodeURIComponent(checkedCheckBoxes[index].getAttribute("spanPort")) + "###";
                         });
+                        if (checkedCheckBoxes.size() === 0) {
+                               alert('Please select at least one SPAN port');
+                               return false;
+                        }
 
                         var requestData = {};
                         requestData["spanPortsToDelete"] = spanPortsToDelete;
@@ -1155,7 +1178,7 @@ one.f.switchmanager.spanPortConfig = {
                     $("#" + one.f.switchmanager.spanPortConfig.id.dashlet.datagrid).find(':checkbox').prop('checked',
                         $("#"+one.f.switchmanager.spanPortConfig.id.dashlet.selectAll).is(':checked'));
                 });
-                $(".spanPortConfig").click(function(){
+                $(".spanPortConfig").click(function(e){
                     if (!$('.spanPortConfig[type=checkbox]:not(:checked)').length) {
                         $("#"+one.f.switchmanager.spanPortConfig.id.dashlet.selectAll)
                             .prop("checked",
@@ -1165,7 +1188,7 @@ one.f.switchmanager.spanPortConfig = {
                             .prop("checked",
                          false);
                     }
-                    event.stopPropagation();
+                    e.stopPropagation();
                 });
              });
         });