Merge "Fix legacy drag and drop widgets"

openstack · Mar 9, 2016 · 20f00de · 20f00de
2 parents 2ac6a69 + cc4126f
commit 20f00de
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/horizon/static/horizon/js/horizon.firewalls.js b/horizon/static/horizon/js/horizon.firewalls.js
@@ -40,7 +40,7 @@ horizon.firewalls = {
    * rule id for rule_id.
    **/
   get_rule_element: function(rule_id) {
-    return $('li > label[for^="id_rule_' + rule_id + '"]');
+    return $('label[for^="id_rule_' + rule_id + '"]');
   },
 
   /*
@@ -51,7 +51,7 @@ horizon.firewalls = {
     horizon.firewalls.rules_selected = [];
     horizon.firewalls.rules_available = [];
     $(this.get_rule_element("")).each(function(){
-      var $this = $(this);
+      var $this = $(this).parent();
       var $input = $this.children("input");
       var rule_property = {
         name:$this.text().replace(/^\s+/,""),
@@ -147,7 +147,7 @@ horizon.firewalls = {
    * router id for router_id.
    **/
   get_router_element: function(router_id) {
-    return $('li > label[for^="id_router_' + router_id + '"]');
+    return $('label[for^="id_router_' + router_id + '"]');
   },
 
   /*
@@ -158,7 +158,7 @@ horizon.firewalls = {
     horizon.firewalls.routers_selected = [];
     horizon.firewalls.routers_available = [];
     $(this.get_router_element("")).each(function(){
-      var $this = $(this);
+      var $this = $(this).parent();
       var $input = $this.children("input");
       var router_property = {
         name:$this.text().replace(/^\s+/,""),

diff --git a/horizon/static/horizon/js/horizon.instances.js b/horizon/static/horizon/js/horizon.instances.js
@@ -40,7 +40,7 @@ horizon.instances = {
    * network id for network_id.
    **/
   get_network_element: function(network_id) {
-    return $('li > label[for^="id_network_' + network_id + '"]');
+    return $('label[for^="id_network_' + network_id + '"]');
   },
 
   /*
@@ -51,7 +51,7 @@ horizon.instances = {
     horizon.instances.networks_selected = [];
     horizon.instances.networks_available = [];
     $(this.get_network_element("")).each(function () {
-      var $this = $(this);
+      var $this = $(this).parent();
       var $input = $this.children("input");
       var name = horizon.string.escapeHtml($this.text().replace(/^\s+/, ""));
       var network_property = {