cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [2/2] git commit: updated refs/heads/master to 1c2362c
Date Fri, 26 Jul 2013 21:30:53 GMT
Instance wizard: Fix logic preventing VPC network from being unchecked


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1c2362c1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1c2362c1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1c2362c1

Branch: refs/heads/master
Commit: 1c2362c163e68041553b8307b421f1060166cd3a
Parents: 33aab25
Author: Brian Federle <brian.federle@citrix.com>
Authored: Fri Jul 26 14:29:55 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Fri Jul 26 14:30:48 2013 -0700

----------------------------------------------------------------------
 ui/scripts/ui-custom/instanceWizard.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1c2362c1/ui/scripts/ui-custom/instanceWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/instanceWizard.js b/ui/scripts/ui-custom/instanceWizard.js
index c1407fe..b9012ef 100644
--- a/ui/scripts/ui-custom/instanceWizard.js
+++ b/ui/scripts/ui-custom/instanceWizard.js
@@ -123,10 +123,15 @@
                                             $select.siblings('.single-select:visible').find('input[type=checkbox]')
                                                 .attr('checked', false);
 
-                                            if (!$('input[name=new-network]:visible').is(':checked'))
{
+                                            var $checkedOtherSelect = $otherSelects.filter(function()
{
+                                                return $(this).not('.single-select') &&
+                                                    $(this).find('input[type=checkbox]:checked').size()
&&
+                                                    $(this).find('input[type=radio]:checked').size();
+                                            });
+
+                                            if (!$checkedOtherSelect.size() &&
+                                                !$('.new-network:visible input[type=radio]:checked').size())
{
                                                 $(this).closest('.select').find('input[type=radio]').click();
-                                            } else {
-                                                $newNetwork.find('input[type=radio]').click();
                                             }
                                         }
 


Mime
View raw message