1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/34eda4f7eed7/ Changeset: 34eda4f7eed7 User: dan Date: 2013-09-24 23:37:10 Summary: Cloudlaunch: on errors getting account info, display message to user. e.g. when key id and secret are mismatched. Affected #: 2 files
diff -r 20a67f12b9b85178fe8342401b94a380d0bbc190 -r 34eda4f7eed7e7487ce350e0042e1c1cdf65d6a9 lib/galaxy/webapps/galaxy/controllers/cloudlaunch.py --- a/lib/galaxy/webapps/galaxy/controllers/cloudlaunch.py +++ b/lib/galaxy/webapps/galaxy/controllers/cloudlaunch.py @@ -53,6 +53,8 @@ kps = ec2_conn.get_all_key_pairs() except EC2ResponseError, e: log.error("Problem starting an instance: %s\n%s" % (e, e.body)) + trans.response.status = 400 + return e.error_message or "Instance failure, but no specific error was detected. Please check your AWS Console." account_info['keypairs'] = [akp.name for akp in kps] #Existing Clusters s3_conn = S3Connection(key_id, secret, calling_format=OrdinaryCallingFormat())
diff -r 20a67f12b9b85178fe8342401b94a380d0bbc190 -r 34eda4f7eed7e7487ce350e0042e1c1cdf65d6a9 templates/webapps/galaxy/cloud/index.mako --- a/templates/webapps/galaxy/cloud/index.mako +++ b/templates/webapps/galaxy/cloud/index.mako @@ -80,6 +80,8 @@ secret_el = $("#id_secret"); key_el = $("#id_key_id"); if (secret_el.val().length === 40 && key_el.val().length === 20){ + //Clear errors + $('.errormessage').remove() //Submit these to get_account_info, unhide fields, and update as appropriate $.ajax({type: "POST", url: ACCOUNT_URL, @@ -106,6 +108,12 @@ kplist.append($('<option/>').val(keypair).text(keypair)); }); $('#hidden_options').show('fast'); + }, + error: function(jqXHR, textStatus, errorThrown){ + //Show error message + $('#launchFormContainer').prepend('<div class="errormessage">' + errorThrown + " : " + jqXHR.responseText + '</div>'); + //Hide the options form + $('#hidden_options').hide('fast'); } }); }
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.