cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/master to 598628f
Date Fri, 10 Jan 2014 18:49:33 GMT
Updated Branches:
  refs/heads/master a2b3e3a60 -> 598628f51


CLOUDSTACK-5840: UI > Snapshots > create volume from snapshot dialog > add zone dropdown
if region-wide secondary storage exists.


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

Branch: refs/heads/master
Commit: 598628f517b839c8be4b326530308804d61e1c62
Parents: a2b3e3a
Author: Jessica Wang <jessica.wang@citrix.com>
Authored: Thu Jan 9 14:35:12 2014 -0800
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Fri Jan 10 10:49:18 2014 -0800

----------------------------------------------------------------------
 ui/scripts/storage.js | 47 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/598628f5/ui/scripts/storage.js
----------------------------------------------------------------------
diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js
index 3e9c91d..603a82f 100644
--- a/ui/scripts/storage.js
+++ b/ui/scripts/storage.js
@@ -1751,13 +1751,50 @@
                                 createForm: {
                                     title: 'label.action.create.volume',
                                     desc: '',
+                                    preFilter: function(args) {
+                                	    debugger;
+                                	    if (g_regionsecondaryenabled == true) {
+                                	    	args.$form.find('.form-item[rel=zoneid]').css('display',
'inline-block');
+                                	    } else {
+                                	    	args.$form.find('.form-item[rel=zoneid]').hide();
+                                	    }
+                                    },
                                     fields: {
                                         name: {
                                             label: 'label.name',
                                             validation: {
                                                 required: true
                                             }
-                                        }
+                                        },                                        
+                                        zoneid: {
+                                            label: 'label.availability.zone',  
+                                            isHidden: true,
+                                            select: function(args) {
+                                                $.ajax({
+                                                    url: createURL("listZones&available=true"),
+                                                    dataType: "json",
+                                                    async: true,
+                                                    success: function(json) {
+                                                        var zoneObjs = json.listzonesresponse.zone;
                                                       
+                                                        var items = [{
+                                                            id: '',
+                                                            description: ''
+                                                        }];                             
                          
+                                                        if (zoneObjs != null) {
+                                                        	for (i = 0; i < zoneObjs.length;
i++) {
+                                                        		items.push({
+                                                        			id: zoneObjs[i].id,
+                                                        			description: zoneObjs[i].name
+                                                        		});
+                                                        	}
+                                                        }     
+                                                        args.response.success({         
                                                  
+                                                            data: items
+                                                        });
+                                                    }
+                                                });
+                                            }
+                                        }                                        
                                     }
                                 },
                                 action: function(args) {
@@ -1765,7 +1802,13 @@
                                         snapshotid: args.context.snapshots[0].id,
                                         name: args.data.name
                                     };
-
+                                    
+                                    if (args.$form.find('.form-item[rel=zoneid]').css("display")
!= "none" && args.data.zoneid != '') {                                    
+	                                    $.extend(data, {
+	                                    	zoneId: args.data.zoneid
+	                                    });   
+                                    }                                    
+                                    
                                     $.ajax({
                                         url: createURL('createVolume'),
                                         data: data,


Mime
View raw message