1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/40ff9b0e1549/ changeset: 40ff9b0e1549 user: dannon date: 2012-06-26 17:07:09 summary: Add share_string option to cloud_launch. affected #: 2 files
diff -r 2e0254547b09bfccbd0834524a0fb4919b6a6efd -r 40ff9b0e1549c1b083a3822b25b8337808ad8995 lib/galaxy/web/controllers/cloudlaunch.py --- a/lib/galaxy/web/controllers/cloudlaunch.py +++ b/lib/galaxy/web/controllers/cloudlaunch.py @@ -25,11 +25,11 @@ BaseUIController.__init__(self, app)
@web.expose - def index(self, trans): - return trans.fill_template("cloud/index.mako") + def index(self, trans, share_string=None): + return trans.fill_template("cloud/index.mako", share_string=share_string)
@web.expose - def launch_instance(self, trans, cluster_name, password, key_id, secret, instance_type): + def launch_instance(self, trans, cluster_name, password, key_id, secret, instance_type, share_string): ec2_error = None try: # Create security group & key pair used when starting an instance @@ -47,6 +47,8 @@ 'instance_type':instance_type} if password: user_provided_data['password'] = password + if share_string: + user_provided_data['share_string'] = share_string rs = run_instance(ec2_conn=ec2_conn, user_provided_data=user_provided_data, key_name=kp_name,
diff -r 2e0254547b09bfccbd0834524a0fb4919b6a6efd -r 40ff9b0e1549c1b083a3822b25b8337808ad8995 templates/cloud/index.mako --- a/templates/cloud/index.mako +++ b/templates/cloud/index.mako @@ -59,7 +59,7 @@ <form action="${h.url_for( controller='cloudlaunch', action='launch_instance' )}" method="post"><div class="form-row"><label for="id_cluster_name">Cluster Name</label> - <input type="text" size="80" name="cluster_name" id="id_cluster_name"/><br/> + <input type="text" size="40" name="cluster_name" id="id_cluster_name"/><br/></div><div class="form-row"><label for="id_password">Password</label> @@ -73,6 +73,14 @@ <label for="id_secret">Secret Key</label><input type="password" size="120" name="secret" id="id_secret"/><br/></div> + %if share_string: + <input type='hidden' name='share_string' value='${share_string}'/> + %else: + <div class="form-row"> + <label for="id_share_string">Instance Share String (optional)</label> + <input type="text" size="120" name="share_string" id="id_share_string"/><br/> + </div> + %endif <div class="form-row"><label for="id_instance_type">Instance Type</label><select name="instance_type" id="id_instance_type">
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.