You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/07/26 23:30:52 UTC
[1/2] git commit: updated refs/heads/4.2 to e8ce890
Updated Branches:
refs/heads/4.2 f6a47d13a -> e8ce89036
refs/heads/master 33aab256f -> 1c2362c16
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/e8ce8903
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e8ce8903
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e8ce8903
Branch: refs/heads/4.2
Commit: e8ce89036a6e57d7a71fe8abe34039d804505e43
Parents: f6a47d1
Author: Brian Federle <br...@citrix.com>
Authored: Fri Jul 26 14:29:55 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Fri Jul 26 14:30:14 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/e8ce8903/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();
}
}
[2/2] git commit: updated refs/heads/master to 1c2362c
Posted by bf...@apache.org.
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 <br...@citrix.com>
Authored: Fri Jul 26 14:29:55 2013 -0700
Committer: Brian Federle <br...@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();
}
}