You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2013/08/15 02:47:52 UTC
git commit: updated refs/heads/master to fc202bc
Updated Branches:
refs/heads/master 419e57b91 -> fc202bcfd
CLOUDSTACK-4302: UI > VM wizard > affinity group step > if selected zone is dedicated, pre-select ExplicitDedication affinity group and make it non-editable.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fc202bcf
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fc202bcf
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fc202bcf
Branch: refs/heads/master
Commit: fc202bcfdd3f9c578f6bca36804af8ea864e6335
Parents: 419e57b
Author: Jessica Wang <je...@apache.org>
Authored: Wed Aug 14 17:44:25 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Wed Aug 14 17:47:44 2013 -0700
----------------------------------------------------------------------
ui/scripts/instanceWizard.js | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fc202bcf/ui/scripts/instanceWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js
index 25b8d9e..1179a87 100644
--- a/ui/scripts/instanceWizard.js
+++ b/ui/scripts/instanceWizard.js
@@ -320,16 +320,27 @@
$.ajax({
url: createURL('listAffinityGroups'),
success: function(json) {
- var items = json.listaffinitygroupsresponse.affinitygroup;
+ var affinitygroups = json.listaffinitygroupsresponse.affinitygroup;
var data = {
- affinityGroups: items
+ affinityGroups: affinitygroups
};
- if ('affinityGroups' in args.context) {
- $.extend(data, {
- selectedObj: args.context.affinityGroups[0],
+
+ if(selectedZoneObj.domainid != null && selectedZoneObj.affinitygroupid != null) {
+ var defaultAffinityGroup;
+ if(affinitygroups != null) {
+ for(var i = 0; i < affinitygroups.length; i++) {
+ if(affinitygroups[i].id == selectedZoneObj.affinitygroupid) {
+ defaultAffinityGroup = affinitygroups[i];
+ break;
+ }
+ }
+ }
+ $.extend(data, {
+ selectedObj: defaultAffinityGroup,
selectedObjNonEditable: true
});
- }
+ }
+
args.response.success({
data: data
});