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 2015/01/20 19:53:57 UTC

git commit: updated refs/heads/volume-upload to e92e46a

Repository: cloudstack
Updated Branches:
  refs/heads/volume-upload 2a2d4364e -> e92e46aba


Dialog uploader -> getURL(): Pass $form


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

Branch: refs/heads/volume-upload
Commit: e92e46aba5e5ef84f50f37b9e7f9fcfd41695fb1
Parents: 2a2d436
Author: Brian Federle <br...@citrix.com>
Authored: Tue Jan 20 10:53:24 2015 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Jan 20 10:53:24 2015 -0800

----------------------------------------------------------------------
 ui/scripts/ui/dialog.js | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e92e46ab/ui/scripts/ui/dialog.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/dialog.js b/ui/scripts/ui/dialog.js
index 1c7904a..66c6795 100644
--- a/ui/scripts/ui/dialog.js
+++ b/ui/scripts/ui/dialog.js
@@ -685,6 +685,7 @@
                 var uploadFiles = function() {
                     $form.prepend($('<div>').addClass('loading-overlay'));
                     args.form.fileUpload.getURL({
+                        $form: $form,
                         formData: data,
                         context: args.context,
                         response: {
@@ -708,6 +709,7 @@
                                 $frameForm.submit(function() {
                                     $uploadFrame.load(function() {
                                         args.form.fileUpload.postUpload({
+                                            $form: $form,
                                             formData: data,
                                             context: args.context,
                                             response: {