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 2015/01/21 01:58:24 UTC

git commit: updated refs/heads/volume-upload to 4e569f8

Repository: cloudstack
Updated Branches:
  refs/heads/volume-upload 68789b76d -> 4e569f85e


volume-upload: UI > upload template from local > fix a bug that fields below OS Type field (isPublic, isFeatured, ~ ) are not created.


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

Branch: refs/heads/volume-upload
Commit: 4e569f85ebfb378bad8009bbaa86776e94cd1af2
Parents: 68789b7
Author: Jessica Wang <je...@apache.org>
Authored: Tue Jan 20 16:58:04 2015 -0800
Committer: Jessica Wang <je...@apache.org>
Committed: Tue Jan 20 16:58:04 2015 -0800

----------------------------------------------------------------------
 ui/scripts/templates.js | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4e569f85/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index 5c2f495..14b8c39 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -856,20 +856,18 @@
                                     osTypeId: {
                                         label: 'label.os.type',
                                         docID: 'helpRegisterTemplateOSType',
-                                        select: function(args) {
-                                            if (ostypeObjs == undefined) {
-                                                $.ajax({
-                                                    url: createURL("listOsTypes"),
-                                                    dataType: "json",
-                                                    async: false,
-                                                    success: function(json) {
-                                                        ostypeObjs = json.listostypesresponse.ostype;
-                                                    }
-                                                });
-                                            }
-                                            args.response.success({
-                                                data: ostypeObjs
-                                            });
+                                        select: function(args) {    
+                                            $.ajax({
+                                                url: createURL("listOsTypes"),
+                                                dataType: "json",
+                                                async: true,
+                                                success: function(json) {	                                                	
+                                                	var ostypeObjs = json.listostypesresponse.ostype;
+                                                	args.response.success({
+                                                        data: ostypeObjs
+                                                    });
+                                                }
+                                            });                                        	    
                                         }
                                     },