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 23:53:36 UTC
git commit: updated refs/heads/volume-upload to 9acfb2e
Repository: cloudstack
Updated Branches:
refs/heads/volume-upload 573a4b1e4 -> 9acfb2eec
volume-upload: UI > upload template from local > after uploading file to postURL, pop up a message indicating where to check the template's newest status.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9acfb2ee
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9acfb2ee
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9acfb2ee
Branch: refs/heads/volume-upload
Commit: 9acfb2eec14ce7b8c7355c35793db3935c95770d
Parents: 573a4b1
Author: Jessica Wang <je...@apache.org>
Authored: Wed Jan 21 14:51:53 2015 -0800
Committer: Jessica Wang <je...@apache.org>
Committed: Wed Jan 21 14:51:53 2015 -0800
----------------------------------------------------------------------
ui/scripts/templates.js | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9acfb2ee/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index 4a1921f..e5d8df0 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -635,8 +635,7 @@
url: createURL('getUploadParamsForTemplate'),
data: data,
async: false,
- success: function(json) {
- debugger;
+ success: function(json) {
/*
{
"postuploadtemplateresponse": {
@@ -653,7 +652,7 @@
var uploadparams = json.postuploadtemplateresponse.getuploadparams; //son.postuploadtemplateresponse.getuploadparams is an object, not an array of object.
var templateId = uploadparams.id;
- debugger;
+
args.response.success({
url: uploadparams.postURL,
data: {
@@ -661,14 +660,17 @@
expires: uploadparams.timeout,
metadata: uploadparams.metadata
}
+ });
+
+ cloudStack.dialog.notice({
+ message: "This template file has been uploaded. Please check its status at Templates menu > " + args.data.name + " > Zones tab > click a zone > Status field and Ready field."
});
- debugger;
+
}
- });
- debugger;
+ });
},
postUpload: function(args) {
- debugger;
+ console.log("postUpload() is hit");
// Called when upload is done to do
// verification checks;
// i.e., poll the server to verify successful upload
@@ -911,8 +913,7 @@
},
action: function(args) {
- debugger;
-
+ return; //createForm.fileUpload.getURL() has executed the whole action. Therefore, nothing needs to be done here.
},
notification: {