1 new changeset in galaxy-central:

http://bitbucket.org/galaxy/galaxy-central/changeset/963e73d40e24/ changeset: 963e73d40e24 user: jgoecks date: 2011-06-29 19:27:01 summary: Fix bugs and enable workflows to be uploaded to myExperiment (www.myexperiment.org). affected #: 2 files (115 bytes)

--- a/lib/galaxy/web/controllers/workflow.py Wed Jun 29 11:07:37 2011 -0400 +++ b/lib/galaxy/web/controllers/workflow.py Wed Jun 29 13:27:01 2011 -0400 @@ -107,7 +107,7 @@ stored_list_grid = StoredWorkflowListGrid() published_list_grid = StoredWorkflowAllPublishedGrid()

- __myexp_url = "sandbox.myexperiment.org:80" + __myexp_url = "www.myexperiment.org:80"

@web.expose def index( self, trans ): @@ -972,7 +972,7 @@ # NOTE: blocks web thread. headers = {} if myexp_username and myexp_password: - auth_header = base64.b64encode( '%s:%s' % ( myexp_username, myexp_password ))[:-1] + auth_header = base64.b64encode( '%s:%s' % ( myexp_username, myexp_password )) headers = { "Authorization" : "Basic %s" % auth_header } conn.request( "GET", "/workflow.xml?id=%s&elements=content" % myexp_id, headers=headers ) response = conn.getresponse() @@ -1037,8 +1037,8 @@ request = unicode( request_raw.strip(), 'utf-8' )

# Do request and get result. - auth_header = base64.b64encode( '%s:%s' % ( myexp_username, myexp_password ))[:-1] - headers = { "Content-type": "text/xml", "Accept": "text/plain", "Authorization" : "Basic %s" % auth_header } + auth_header = base64.b64encode( '%s:%s' % ( myexp_username, myexp_password )) + headers = { "Content-type": "text/xml", "Accept": "text/xml", "Authorization" : "Basic %s" % auth_header } conn = httplib.HTTPConnection( self.__myexp_url ) # NOTE: blocks web thread. conn.request("POST", "/workflow.xml", request, headers)

--- a/templates/workflow/export.mako Wed Jun 29 11:07:37 2011 -0400 +++ b/templates/workflow/export.mako Wed Jun 29 13:27:01 2011 -0400 @@ -22,9 +22,8 @@ ## ## Renders form for exporting workflow to myExperiment. ## - <h3>Export to myExperiment <em>sandbox</em></h3> + <h3>Export to myExperiment</h3>

- ##def export_to_myexp( self, trans, id, myexp_username, myexp_password ): <div class="toolForm"><div class="toolFormTitle">Export</div><form action="${h.url_for( action='export_to_myexp', id=trans.security.encode_id( item.id ) )}"

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.