Merge "CHange log level from warn to debug in ProtocolSessionPromise when connection...

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

diff --git a/opendaylight/web/flows/src/main/resources/js/page.js b/opendaylight/web/flows/src/main/resources/js/page.js
index 6b4cfa00253ef4f36026a51f639fba6af02ed4b6..ab8301bf73dd21fb842aeee16b3a80dc647039a2 100644 (file)
--- a/opendaylight/web/flows/src/main/resources/js/page.js
+++ b/opendaylight/web/flows/src/main/resources/js/page.js
@@ -390,8 +390,8 @@ one.f.flows = {
                     $tr = $(tr);
                     $span = $("td span", $tr);
                     var flowstatus = $span.data("flowstatus");
-                    if($span.data("installInHw") != null) {
-                        var installInHw = $span.data("installInHw").toString();
+                    if($span.data("installinhw") != null) {
+                        var installInHw = $span.data("installinhw").toString();
                         if(installInHw == "true" && flowstatus == "Success") {
                             $tr.addClass("success");
                         } else {
@@ -457,7 +457,8 @@ one.f.flows = {
             var editButton = one.lib.dashlet.button.single("Edit Flow", one.f.flows.id.dashlet.edit, "btn-primary", "btn-mini");
             var $editButton = one.lib.dashlet.button.button(editButton);
             $editButton.click(function() {
-                var $modal = one.f.flows.modal.initialize(true);
+               var install = flow['flow']['installInHw'];
+                var $modal = one.f.flows.modal.initialize(true,install);
                 $modal.modal().on('shown',function(){
                     var $port = $('#'+one.f.flows.id.modal.form.port);
                     $('#'+one.f.flows.id.modal.form.nodes).trigger("change");
@@ -550,7 +551,7 @@ one.f.flows = {
                 return $p;
             }
         },
-        initialize : function(edit) {
+        initialize : function(edit,install) {
             var h3;
             if(edit) {
                 h3 = "Edit Flow Entry";
@@ -571,7 +572,7 @@ one.f.flows = {
             if (edit) {
                 // bind edit flow button
                 $('#'+one.f.flows.id.modal.edit, $modal).click(function() {
-                    one.f.flows.modal.save($modal, 'true', true);
+                    one.f.flows.modal.save($modal, install, true);
                 });
             } else {
                 // bind add flow button